bugzilla 3495 Segfault(typinf.c) instantiating D variadic function wi…

…th too few arguments
dlang · Dec 3, 2009 · 23025ef · 23025ef
1 parent 57e26ae
commit 23025ef
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -649,7 +649,7 @@ void functionParameters(Loc loc, Scope *sc, TypeFunction *tf, Expressions *argum
 		    if (tf->varargs == 2 && i + 1 == nparams)
 			goto L2;
 		    error(loc, "expected %zu function arguments, not %zu", nparams, nargs);
-		    break;
+		    return;
 		}
 		arg = p->defaultArg;
 #if DMDV2
@@ -670,7 +670,9 @@ void functionParameters(Loc loc, Scope *sc, TypeFunction *tf, Expressions *argum
 		if (arg->implicitConvTo(p->type))
 		{
 		    if (nargs != nparams)
-		        error(loc, "expected %zu function arguments, not %zu", nparams, nargs);
+		    {	error(loc, "expected %zu function arguments, not %zu", nparams, nargs);
+			return;
+		    }
 		    goto L1;
 		}
 	     L2:
@@ -881,9 +883,8 @@ void functionParameters(Loc loc, Scope *sc, TypeFunction *tf, Expressions *argum
     // If D linkage and variadic, add _arguments[] as first argument
     if (tf->linkage == LINKd && tf->varargs == 1)
     {
-	Expression *e;
-
-	e = createTypeInfoArray(sc, (Expression **)&arguments->data[nparams],
+	assert(arguments->dim >= nparams);
+	Expression *e = createTypeInfoArray(sc, (Expression **)&arguments->data[nparams],
 		arguments->dim - nparams);
 	arguments->insert(0, e);
     }