Merge pull request #129 from frida/fix/darwin-aarch64-cif-prep

Fix non-variadic CIF initialization for Apple/ARM64
2014-09-18 19:05:35 -04:00
parent 7b7a5284de 0f4e09d27d
commit 5df384077f
1 changed files with 7 additions and 1 deletions
--- a/src/aarch64/ffi.c
+++ b/src/aarch64/ffi.c
@@ -779,6 +779,8 @@ ffi_prep_cif_machdep (ffi_cif *cif)
          }
    }

+  cif->aarch64_nfixedargs = 0;
+
  return FFI_OK;
 }

@@ -789,9 +791,13 @@ ffi_status ffi_prep_cif_machdep_var(ffi_cif *cif,
 				    unsigned int nfixedargs,
 				    unsigned int ntotalargs)
 {
+  ffi_status status;
+
+  status = ffi_prep_cif_machdep (cif);
+
  cif->aarch64_nfixedargs = nfixedargs;

-  return ffi_prep_cif_machdep(cif);
+  return status;
 }

 #endif