bug 691505 - ensure Graphite uses infallible malloc to give well-defined OOM behavior. r=roc

gfx/graphite2/src/Makefile.in

@@ -76,6 +76,10 @@ DEFINES += -DPACKAGE_BUGREPORT="\"http://bugzilla.mozilla.org/\""
 # disable features we don't need in the graphite2 code, to reduce code size
 DEFINES += -DDISABLE_FILE_FACE -DDISABLE_TRACING -DDISABLE_SEGCACHE
 
+# provide a custom header that overrides malloc() and friends,
+# to ensure safe OOM handling
+DEFINES += -DGR_CUSTOM_HEADER="\"MozGrMalloc.h\""
+
 # Filter out -pedantic so that direct_machine.cpp can use computed goto
 CXXFLAGS := $(filter-out -pedantic,$(CXXFLAGS))
 CFLAGS := $(filter-out -pedantic,$(CFLAGS))

gfx/graphite2/src/MozGrMalloc.h

@@ -0,0 +1,53 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Gecko-Graphite2 integration.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jonathan Kew <jfkthame@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+#ifndef MOZ_GR_MALLOC_H
+#define MOZ_GR_MALLOC_H
+
+// Override malloc() and friends to call moz_malloc() etc, so that we get
+// predictable, safe OOM crashes rather than relying on the code to handle
+// allocation failures reliably.
+
+#include "mozilla/mozalloc.h"
+
+#define malloc moz_xmalloc
+#define calloc moz_xcalloc
+#define realloc moz_xrealloc
+#define free moz_free
+
+#endif // MOZ_GR_MALLOC_H