From 093b8aee9b11ffc1f397ffd296ad4dbb5f9a0540 Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Fri, 19 Apr 2013 19:32:20 +0000 Subject: Get SimpleStringDictionary compiling on Linux. BUG=http://code.google.com/p/chromium/issues/detail?id=77656 Review URL: https://breakpad.appspot.com/564002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1155 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/common/simple_string_dictionary.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/common/simple_string_dictionary.h b/src/common/simple_string_dictionary.h index dbeaabc0..26bcba57 100644 --- a/src/common/simple_string_dictionary.h +++ b/src/common/simple_string_dictionary.h @@ -30,8 +30,7 @@ #ifndef COMMON_SIMPLE_STRING_DICTIONARY_H_ #define COMMON_SIMPLE_STRING_DICTIONARY_H_ -#import -#import +#include namespace google_breakpad { @@ -80,15 +79,18 @@ class KeyValueEntry { value = ""; } - strlcpy(key_, key, sizeof(key_)); - strlcpy(value_, value, sizeof(value_)); + strncpy(key_, key, sizeof(key_)); + strncpy(value_, value, sizeof(value_)); + key_[sizeof(key_) - 1] = '\0'; + value_[sizeof(value_) - 1] = '\0'; } void SetValue(const char *value) { if (!value) { value = ""; } - strlcpy(value_, value, sizeof(value_)); + strncpy(value_, value, sizeof(value_)); + value_[sizeof(value_) - 1] = '\0'; }; // Removes the key/value -- cgit v1.2.1