clang-analyzer: uninitialized va_list (#6798)

zwoop · web-flow · commit 0c9fab53bd82 · 2020-05-20T09:23:48.000-06:00
diff --git a/src/tscore/Diags.cc b/src/tscore/Diags.cc
@@ -460,15 +460,12 @@ Diags::dump(FILE *fp) const
 void
 Diags::error_va(DiagsLevel level, const SourceLocation *loc, const char *format_string, va_list ap) const
 {
-  va_list ap2;
-
-  if (DiagsLevel_IsTerminal(level)) {
-    va_copy(ap2, ap);
-  }
-
   print_va(nullptr, level, loc, format_string, ap);
 
   if (DiagsLevel_IsTerminal(level)) {
+    va_list ap2;
+
+    va_copy(ap2, ap);
     if (cleanup_func) {
       cleanup_func();
     }
@@ -479,9 +476,8 @@ Diags::error_va(DiagsLevel level, const SourceLocation *loc, const char *format_
     } else {
       ink_fatal_va(format_string, ap2);
     }
+    va_end(ap2);
   }
-
-  va_end(ap2);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -460,15 +460,12 @@ Diags::dump(FILE *fp) const`
`460`	`460`	`void`
`461`	`461`	`Diags::error_va(DiagsLevel level, const SourceLocation loc, const char format_string, va_list ap) const`
`462`	`462`	`{`
`463`		`- va_list ap2;`
`464`		`-`
`465`		`- if (DiagsLevel_IsTerminal(level)) {`
`466`		`- va_copy(ap2, ap);`
`467`		`- }`
`468`		`-`
`469`	`463`	`print_va(nullptr, level, loc, format_string, ap);`
`470`	`464`
`471`	`465`	`if (DiagsLevel_IsTerminal(level)) {`
	`466`	`+ va_list ap2;`
	`467`	`+`
	`468`	`+ va_copy(ap2, ap);`
`472`	`469`	`if (cleanup_func) {`
`473`	`470`	`cleanup_func();`
`474`	`471`	`}`
`@@ -479,9 +476,8 @@ Diags::error_va(DiagsLevel level, const SourceLocation loc, const char format_`
`479`	`476`	`} else {`
`480`	`477`	`ink_fatal_va(format_string, ap2);`
`481`	`478`	`}`
	`479`	`+ va_end(ap2);`
`482`	`480`	`}`
`483`		`-`
`484`		`- va_end(ap2);`
`485`	`481`	`}`
`486`	`482`
`487`	`483`	`/*`