Merge branch 'maint'

Author: lucioleKi

lib/erl_interface/src/misc/ei_x_encode.c

@@ -69,9 +69,13 @@ int x_fix_buff(ei_x_buff* x, int szneeded)
 {
     int sz = szneeded + ei_x_extra;
     if (sz > x->buffsz) {
-	sz += ei_x_extra;	/* to avoid reallocating each and every time */
-	x->buffsz = sz;
-	x->buff = ei_realloc(x->buff, sz);
+        char* newbuff;
+        sz += ei_x_extra;       /* to avoid reallocating each and every time */
+        newbuff = ei_realloc(x->buff, sz);
+        if (newbuff == NULL)
+            return 0;           /* leave x->buff and x->buffsz intact on failure */
+        x->buff = newbuff;
+        x->buffsz = sz;
     }
     return x->buff != NULL;
 }