[svn:parrot] r42136 - trunk/src

[chromatic at svn.parrot.org]

Author: chromatic
Date: Tue Oct 27 18:15:11 2009
New Revision: 42136
URL: https://trac.parrot.org/parrot/changeset/42136

Log:
[ex] Initialized result pointer in Parrot_call_sub(), as it may end up
uninitialized when returned.  Found by Coverity in CID #434.

Modified:
   trunk/src/extend.c

Modified: trunk/src/extend.c
==============================================================================
--- trunk/src/extend.c	Tue Oct 27 18:15:07 2009	(r42135)
+++ trunk/src/extend.c	Tue Oct 27 18:15:11 2009	(r42136)
@@ -1161,21 +1161,22 @@
 PARROT_EXPORT
 PARROT_WARN_UNUSED_RESULT
 PARROT_CAN_RETURN_NULL
-void*
+void *
 Parrot_call_sub(PARROT_INTERP, Parrot_PMC sub_pmc,
                  ARGIN(const char *signature), ...)
 {
     ASSERT_ARGS(Parrot_call_sub)
-    va_list args;
-    PMC  *sig_object;
-    void *result;
-    char  return_sig = signature[0];
-    const char *arg_sig = signature;
+    va_list     args;
+    PMC        *sig_object;
     Parrot_sub *sub;
+    void       *result     = NULL;
+    const char *arg_sig    = signature;
+    char        return_sig = signature[0];
 
     arg_sig++;
     va_start(args, signature);
-    sig_object = Parrot_pcc_build_sig_object_from_varargs(interp, PMCNULL, arg_sig, args);
+    sig_object = Parrot_pcc_build_sig_object_from_varargs(interp, PMCNULL,
+        arg_sig, args);
     va_end(args);
 
     /* Add the return argument onto the call signature object (a bit
@@ -1196,17 +1197,20 @@
             break;
         }
         default:
-            Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
-                        "Dispatch: invalid return type %c!", return_sig);
+            Parrot_ex_throw_from_c_args(interp, NULL,
+                EXCEPTION_INVALID_OPERATION,
+                "Dispatch: invalid return type %c!", return_sig);
     }
 
     PMC_get_sub(interp, sub_pmc, sub);
-    Parrot_pcc_set_constants(interp, CURRENT_CONTEXT(interp), sub->seg->const_table->constants);
+    Parrot_pcc_set_constants(interp, CURRENT_CONTEXT(interp),
+        sub->seg->const_table->constants);
     Parrot_pcc_invoke_from_sig_object(interp, sub_pmc, sig_object);
 
     return result;
 }
 
+
 /*
 
 =item C<Parrot_Int Parrot_call_sub_ret_int(PARROT_INTERP, Parrot_PMC sub_pmc,