From bf4aa2cc93a67826247e887b2ba26a1b965eb616 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Tue, 19 May 2015 14:56:52 -0700
Subject: Revert "Remove FX_Alloc() null checks now that it can't return NULL."

This reverts commit eb6527763171cdb4b0fbfea5a20d691f4d67b660.

Reason for revert: broke javascript tests.
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1145843005
---
 core/src/fxcrt/fx_basic_wstring.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'core/src/fxcrt/fx_basic_wstring.cpp')

diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp
index 09e64e0c72..3c54ca983e 100644
--- a/core/src/fxcrt/fx_basic_wstring.cpp
+++ b/core/src/fxcrt/fx_basic_wstring.cpp
@@ -34,6 +34,9 @@ CFX_WideString::StringData* CFX_WideString::StringData::Create(int nLen)
     FXSYS_assert(usableLen >= nLen);
 
     void* pData = FX_Alloc(FX_BYTE, iSize.ValueOrDie());
+    if (!pData) {
+        return NULL;
+    }
     return new (pData) StringData(nLen, usableLen);
 }
 CFX_WideString::~CFX_WideString()
-- 
cgit v1.2.3