From 0453082dbe8aa76e6c92c31d0bc16018fe274e13 Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Tue, 1 Oct 2013 21:32:16 +0000 Subject: [PATCH] In NonAllocatingMap, remove asserts around key/value length. Since the data is stored using strncpy they are merely advisory in debug mode. BUG=https://code.google.com/p/chromium/issues/detail?id=298225 R=mark@chromium.org Review URL: https://breakpad.appspot.com/635002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1219 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/common/simple_string_dictionary.h | 3 --- src/common/simple_string_dictionary_unittest.cc | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/src/common/simple_string_dictionary.h b/src/common/simple_string_dictionary.h index e241aff5..d2ab17fd 100644 --- a/src/common/simple_string_dictionary.h +++ b/src/common/simple_string_dictionary.h @@ -181,8 +181,6 @@ class NonAllocatingMap { if (!entries_[i].is_active()) { entry = &entries_[i]; - assert(strlen(key) < key_size); - strncpy(entry->key, key, key_size); entry->key[key_size - 1] = '\0'; @@ -205,7 +203,6 @@ class NonAllocatingMap { assert(count == 1); #endif - assert(strlen(value) < value_size); strncpy(entry->value, value, value_size); entry->value[value_size - 1] = '\0'; } diff --git a/src/common/simple_string_dictionary_unittest.cc b/src/common/simple_string_dictionary_unittest.cc index 5fbc481c..34f4b9ef 100644 --- a/src/common/simple_string_dictionary_unittest.cc +++ b/src/common/simple_string_dictionary_unittest.cc @@ -290,18 +290,6 @@ TEST(NonAllocatingMapTest, OutOfSpace) { #ifndef NDEBUG -TEST(NonAllocatingMapTest, KeyTooLong) { - NonAllocatingMap<3, 10, 12> map; - map.SetKeyValue("ab", "cdefghi"); - ASSERT_DEATH(map.SetKeyValue("abcdef", "1"), ""); -} - -TEST(NonAllocatingMapTest, ValueTooLong) { - NonAllocatingMap<9, 3, 8> map; - map.SetKeyValue("abcd", "ab"); - ASSERT_DEATH(map.SetKeyValue("abcd", "abc"), ""); -} - TEST(NonAllocatingMapTest, NullKey) { NonAllocatingMap<4, 6, 6> map; ASSERT_DEATH(map.SetKeyValue(NULL, "hello"), "");