Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurityd / lib / sec_xdr_reference.c

diff --git a/OSX/libsecurityd/lib/sec_xdr_reference.c b/OSX/libsecurityd/lib/sec_xdr_reference.c
index 176e67a9d254f082b8e7f55f5687f15fdcc4c61b..e36a6da7187bce5440d678af5f764c27d9bcecf0 100644 (file)
--- a/OSX/libsecurityd/lib/sec_xdr_reference.c
+++ b/OSX/libsecurityd/lib/sec_xdr_reference.c
@@ -59,7 +59,7 @@ static char *sccsid = "@(#)xdr_reference.c      2.1 88/07/29 4.0 RPCSRC";
 static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr_reference.c,v 1.11 2002/03/22 21:53:26 obrien Exp $";
 #endif
 #include <sys/cdefs.h>
-#include <assert.h>
+#include <security_utilities/simulatecrash_assert.h>
 /*
  * xdr_reference.c, Generic XDR routines impelmentation.
  *
@@ -113,7 +113,7 @@ sec_xdr_reference(XDR *xdrs, uint8_t **pp, u_int size, xdrproc_t proc)
                         memset(obj, 0, size);
                                                loc = &obj[0];
                     }
-                                       if (!sizeof_alloc)
+                                       if (!sizeof_alloc && pp != NULL)
                                                *pp = loc;
                                        break;
                 }
@@ -125,7 +125,9 @@ sec_xdr_reference(XDR *xdrs, uint8_t **pp, u_int size, xdrproc_t proc)
 
     if (xdrs->x_op == XDR_FREE) {
         sec_mem_free(xdrs, loc, size);
-        *pp = NULL;
+        if(pp) {
+            *pp = NULL;
+        }
     }
     return (stat);
 }
@@ -143,7 +145,7 @@ sec_xdr_pointer(XDR *xdrs, uint8_t **objpp, u_int obj_size, xdrproc_t xdr_obj)
     bool_t sizeof_alloc = sec_xdr_arena_size_allocator(xdrs);
 
     if (! more_data) {
-        if ((xdrs->x_op == XDR_DECODE) && !sizeof_alloc)
+        if ((xdrs->x_op == XDR_DECODE) && !sizeof_alloc && objpp != NULL)
             *objpp = NULL;
         return (TRUE);
     }