projects
/
platform
/
upstream
/
libffi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1367534
)
Darwin/ARM: Assert on NULL dereference
author
Zachary Waldowski
<zach@waldowski.me>
Mon, 30 Dec 2013 20:26:20 +0000
(15:26 -0500)
committer
Zachary Waldowski
<zach@waldowski.me>
Wed, 5 Feb 2014 19:28:58 +0000
(14:28 -0500)
This inhibits an analyzer warning by Clang on all platforms.
src/arm/ffi.c
patch
|
blob
|
history
diff --git
a/src/arm/ffi.c
b/src/arm/ffi.c
index 9f238e14c068955511250543459593a84375afd5..3b39056ed12d7ec43fc129f9a9b2faea14e4d25b 100644
(file)
--- a/
src/arm/ffi.c
+++ b/
src/arm/ffi.c
@@
-350,9
+350,17
@@
void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
break;
}
if (small_struct)
- memcpy (rvalue, &temp, cif->rtype->size);
+ {
+ FFI_ASSERT(rvalue != NULL);
+ memcpy (rvalue, &temp, cif->rtype->size);
+ }
+
else if (vfp_struct)
- memcpy (rvalue, ecif.rvalue, cif->rtype->size);
+ {
+ FFI_ASSERT(rvalue != NULL);
+ memcpy (rvalue, ecif.rvalue, cif->rtype->size);
+ }
+
}
/** private members **/