Add missing va_end() call to a early exit in dmetaphone.c's StringAt().

anarazel · anarazel · commit 58bc4747be26 · 2015-01-04T15:35:46.000+01:00
Pointed out by Coverity.

Backpatch to all supported branches, the code has been that way for a
long while.
diff --git a/contrib/fuzzystrmatch/dmetaphone.c b/contrib/fuzzystrmatch/dmetaphone.c
@@ -359,7 +359,10 @@ StringAt(metastring *s, int start, int length,...)
 	{
 		test = va_arg(ap, char *);
 		if (*test && (strncmp(pos, test, length) == 0))
+		{
+			va_end(ap);
 			return 1;
+		}
 	}
 	while (strcmp(test, "") != 0);
 

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,10 @@ StringAt(metastring *s, int start, int length,...)`
`359`	`359`	`{`
`360`	`360`	`test = va_arg(ap, char *);`
`361`	`361`	`if (*test && (strncmp(pos, test, length) == 0))`
	`362`	`+ {`
	`363`	`+ va_end(ap);`
`362`	`364`	`return 1;`
	`365`	`+ }`
`363`	`366`	`}`
`364`	`367`	`while (strcmp(test, "") != 0);`
`365`	`368`