Avoid memset(NULL, ...).

R=yangguo@chromium.org

Review URL: https://codereview.chromium.org/290453003

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21320 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/samples/shell.cc b/samples/shell.cc
index e9f9989..aebe49d 100644 (file)
--- a/samples/shell.cc
+++ b/samples/shell.cc
@@ -68,7 +68,8 @@ static bool run_shell;
 class ShellArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
  public:
   virtual void* Allocate(size_t length) {
-    return memset(AllocateUninitialized(length), 0, length);
+    void* data = AllocateUninitialized(length);
+    return data == NULL ? data : memset(data, 0, length);
   }
   virtual void* AllocateUninitialized(size_t length) { return malloc(length); }
   virtual void Free(void* data, size_t) { free(data); }

diff --git a/src/d8.cc b/src/d8.cc
index 8ea77fd..502187a 100644 (file)
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -1450,7 +1450,8 @@ static void DumpHeapConstants(i::Isolate* isolate) {
 class ShellArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
  public:
   virtual void* Allocate(size_t length) {
-    return memset(AllocateUninitialized(length), 0, length);
+    void* data = AllocateUninitialized(length);
+    return data == NULL ? data : memset(data, 0, length);
   }
   virtual void* AllocateUninitialized(size_t length) { return malloc(length); }
   virtual void Free(void* data, size_t) { free(data); }