From 2b04d015d61b0d5def8eccc1f3d08694968882fe Mon Sep 17 00:00:00 2001 From: Andreas Tobler Date: Thu, 6 Nov 2003 16:47:41 +0100 Subject: [PATCH] prep_cif.c (ffi_prep_cif): Move the validity check after the initialization. 2003-11-06 Andreas Tobler * src/prep_cif.c (ffi_prep_cif): Move the validity check after the initialization. From-SVN: r73309 --- libffi/ChangeLog | 7 ++++++- libffi/src/prep_cif.c | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 00ee87c6fdf9..1a472aa7954d 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,6 +1,11 @@ +2003-11-06 Andreas Tobler + + * src/prep_cif.c (ffi_prep_cif): Move the validity check after + the initialization. + 2003-10-23 Andreas Tobler - * src/java_raw_api.c (ffi_java_ptrarray_to_raw): Replace + * src/java_raw_api.c (ffi_java_ptrarray_to_raw): Replace FFI_ASSERT(FALSE) with FFI_ASSERT(0). 2003-10-22 David Daney diff --git a/libffi/src/prep_cif.c b/libffi/src/prep_cif.c index f43ccfc45587..3ee5eadcd7f4 100644 --- a/libffi/src/prep_cif.c +++ b/libffi/src/prep_cif.c @@ -125,13 +125,15 @@ ffi_status ffi_prep_cif(/*@out@*/ /*@partial@*/ ffi_cif *cif, for (ptr = cif->arg_types, i = cif->nargs; i > 0; i--, ptr++) { - /* Perform a sanity check on the argument type */ - FFI_ASSERT_VALID_TYPE(*ptr); /* Initialize any uninitialized aggregate type definitions */ if (((*ptr)->size == 0) && (initialize_aggregate((*ptr)) != FFI_OK)) return FFI_BAD_TYPEDEF; + /* Perform a sanity check on the argument type, do this + check after the initialization. */ + FFI_ASSERT_VALID_TYPE(*ptr); + #if !defined __x86_64__ && !defined S390 #ifdef SPARC if (((*ptr)->type == FFI_TYPE_STRUCT