Merge pull request #381 from compnerd/ffi-nullptr-deref

arm: fix a level of indirection issue
This commit is contained in:
Anthony Green
2017-10-25 13:03:55 -04:00
committed by GitHub

View File

@@ -31,6 +31,7 @@
#include <fficonfig.h> #include <fficonfig.h>
#include <ffi.h> #include <ffi.h>
#include <ffi_common.h> #include <ffi_common.h>
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include "internal.h" #include "internal.h"
@@ -422,7 +423,7 @@ ffi_prep_incoming_args_SYSV (ffi_cif *cif, void *rvalue,
else else
{ {
if (cif->rtype->size && cif->rtype->size < 4) if (cif->rtype->size && cif->rtype->size < 4)
**(int32_t **) rvalue = 0; *(uint32_t *) rvalue = 0;
} }
for (i = 0, n = cif->nargs; i < n; i++) for (i = 0, n = cif->nargs; i < n; i++)