summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Green <green@moxielogic.com>2017-10-25 13:03:55 -0400
committerGitHub <noreply@github.com>2017-10-25 13:03:55 -0400
commit0faf614529ae7ac8bc929415a6e1b076ba1b8cc5 (patch)
tree254c543711d4cb781203e5c5d63be1eb1a64603c
parent8d26e8c6da23b10331181a4bbf837f479ce5d7d2 (diff)
parent3c372c384a94db23fdaf9fe64a4beb86159cf6d3 (diff)
downloadlibffi-0faf614529ae7ac8bc929415a6e1b076ba1b8cc5.tar.gz
Merge pull request #381 from compnerd/ffi-nullptr-deref
arm: fix a level of indirection issue
-rw-r--r--src/arm/ffi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arm/ffi.c b/src/arm/ffi.c
index 12ce04a..d838271 100644
--- a/src/arm/ffi.c
+++ b/src/arm/ffi.c
@@ -31,6 +31,7 @@
#include <fficonfig.h>
#include <ffi.h>
#include <ffi_common.h>
+#include <stdint.h>
#include <stdlib.h>
#include "internal.h"
@@ -422,7 +423,7 @@ ffi_prep_incoming_args_SYSV (ffi_cif *cif, void *rvalue,
else
{
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++)