From ed0fc1d42f097be7bed090f19abdf7c0fd227820 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 21 Mar 2014 14:09:35 -0700 Subject: Don't return null for null utf in AllocFromModifiedUtf8. If you pass in a null utf string it should not be the same behavior as out of memory. This previously caused serious problems in: https://android-review.googlesource.com/#/c/80768/ Change-Id: I9dfb710b57f6cc91064812f52a3db64254769461 --- runtime/intern_table.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'runtime/intern_table.cc') diff --git a/runtime/intern_table.cc b/runtime/intern_table.cc index 524798d..dfc82dd 100644 --- a/runtime/intern_table.cc +++ b/runtime/intern_table.cc @@ -242,15 +242,15 @@ mirror::String* InternTable::Insert(mirror::String* s, bool is_strong) { return InsertWeak(s, hash_code); } -mirror::String* InternTable::InternStrong(int32_t utf16_length, - const char* utf8_data) { +mirror::String* InternTable::InternStrong(int32_t utf16_length, const char* utf8_data) { + DCHECK(utf8_data != nullptr); return InternStrong(mirror::String::AllocFromModifiedUtf8( Thread::Current(), utf16_length, utf8_data)); } mirror::String* InternTable::InternStrong(const char* utf8_data) { - return InternStrong( - mirror::String::AllocFromModifiedUtf8(Thread::Current(), utf8_data)); + DCHECK(utf8_data != nullptr); + return InternStrong(mirror::String::AllocFromModifiedUtf8(Thread::Current(), utf8_data)); } mirror::String* InternTable::InternStrong(mirror::String* s) { -- cgit v1.1