commit ce46d3237c5117b1d2268c17e3639392416ff34d
author Elliott Hughes <enh@google.com> Thu Oct 13 12:11:02 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 13 12:11:02 2011 -0700
tree d5f0c976f48eb52308a69e4e937a40a8c09afbfb
parent b8233d140270a2545d31af0c8818c10b684dfa22
parent 37d4e6bfa71717f2b9e38f2019feb5650161c7bd

Merge "Be careful of failed allocations in the intern table." into dalvik-dev

src/intern_table.cc

diff --git a/src/intern_table.cc b/src/intern_table.cc
index 53208fd..4cc19bd 100644
--- a/src/intern_table.cc
+++ b/src/intern_table.cc
@@ -98,18 +98,24 @@
 }
 
 String* InternTable::InternStrong(int32_t utf16_length, const char* utf8_data) {
-  return Insert(String::AllocFromModifiedUtf8(utf16_length, utf8_data), true);
+  return InternStrong(String::AllocFromModifiedUtf8(utf16_length, utf8_data));
 }
 
 String* InternTable::InternStrong(const char* utf8_data) {
-  return Insert(String::AllocFromModifiedUtf8(utf8_data), true);
+  return InternStrong(String::AllocFromModifiedUtf8(utf8_data));
 }
 
 String* InternTable::InternStrong(String* s) {
+  if (s == NULL) {
+    return NULL;
+  }
   return Insert(s, true);
 }
 
 String* InternTable::InternWeak(String* s) {
+  if (s == NULL) {
+    return NULL;
+  }
   return Insert(s, false);
 }