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

anarazel · anarazel · commit 17797e18dd44 · 2015-01-04T15:35:48.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
@@ -362,7 +362,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, ""));
 

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