Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

binpac: Add missing va_end()'s to match va_start()'s.

Browse source 
Probably not an issue on most implementations, but undefined behavior
is scary and it's easy to fix.
This commit is contained in:
Jon Siwek 2013-09-10 11:30:13 -05:00 • committed by Tim Wojtulewicz
parent cb524c2fde
commit 5e0f604418
1 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tools/binpac/src/pac_output.cc
View file

@ -41,7 +41,21 @@ int Output::print(const char* fmt, ...)
{ {
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
return print(fmt, ap); int r = -1;
try
{
r = print(fmt, ap);
}
catch ( ... )
{
va_end(ap);
throw;
}
va_end(ap);
return r;
} }
int Output::println(const char* fmt, ...) int Output::println(const char* fmt, ...)
@ -49,11 +63,22 @@ int Output::println(const char* fmt, ...)
for ( int i = 0; i < indent(); ++i ) for ( int i = 0; i < indent(); ++i )
fprintf(fp, "\t"); fprintf(fp, "\t");
int r;
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
r = print(fmt, ap); int r = -1;
try
{
r = print(fmt, ap);
}
catch ( ... )
{
va_end(ap);
throw;
}
va_end(ap);
fprintf(fp, "\n"); fprintf(fp, "\n");
return r; return r;
} }