From c165f25410f817d248ad5d07e1827d33efd1b0a0 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 27 Apr 2010 23:28:10 -0400 Subject: [PATCH] [object] Actually handle malloc() failure Caught by John Daggett. --- src/hb-object-private.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/hb-object-private.h b/src/hb-object-private.h index 610ae68..163c5c1 100644 --- a/src/hb-object-private.h +++ b/src/hb-object-private.h @@ -83,10 +83,12 @@ typedef struct { #define HB_OBJECT_DO_CREATE(Type, obj) \ HB_LIKELY (( \ - (obj) = (Type *) calloc (1, sizeof (Type)), \ - HB_OBJECT_DO_INIT_EXPR (obj), \ - HB_OBJECT_DEBUG_OUT (obj), \ - (obj) \ + ( \ + ((obj) = (Type *) calloc (1, sizeof (Type))) && \ + HB_OBJECT_DO_INIT_EXPR (obj) && \ + HB_OBJECT_DEBUG_OUT (obj) \ + ), \ + (obj) \ )) #define HB_OBJECT_DO_REFERENCE(obj) \ -- 2.7.4