Fix malloc of zero size

Caused x264 to fail with some settings on systems that return a NULL pointer for malloc(0), like Solaris.

diff --git a/common/macroblock.c b/common/macroblock.c
index aec5c6a1c0b35a9ca6f8c84a5698d61bdbc04a02..8f0b82cdc8deea632ebba74d47c89bc623b1d99f 100644 (file)
--- a/common/macroblock.c
+++ b/common/macroblock.c
@@ -340,7 +340,10 @@ int x264_macroblock_thread_allocate( x264_t *h, int b_lookahead )
     }
     int buf_mbtree = h->param.rc.b_mb_tree * ((h->mb.i_mb_width+3)&~3) * sizeof(int);
     scratch_size = X264_MAX( scratch_size, buf_mbtree );
-    CHECKED_MALLOC( h->scratch_buffer, scratch_size );
+    if( scratch_size )
+        CHECKED_MALLOC( h->scratch_buffer, scratch_size );
+    else
+        h->scratch_buffer = NULL;
 
     return 0;
 fail: