Commit 0faf614529ae7ac8bc929415a6e1b076ba1b8cc5

Anthony Green 2017-10-25T13:03:55

Merge pull request #381 from compnerd/ffi-nullptr-deref arm: fix a level of indirection issue

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
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++)