lib/base/util.cpp | 10 ++++++++--
lib/libaccess/nseframe.cpp | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 7a9c069a7d64c1370353278c34bf9065aeb604ea
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Jul 1 16:31:27 2010 -0600
Bug 610276 - fix coverity Defect Type: API usage errors issues
https://bugzilla.redhat.com/show_bug.cgi?id=610276
Resolves: bug 610276
Bug Description: fix coverity Defect Type: API usage errors issues
Reviewed by: nhosoi (Thanks!)
Branch: HEAD
Fix Description: Must call va_end after calling va_start.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
diff --git a/lib/base/util.cpp b/lib/base/util.cpp
index 7e9bdbd..d3a7c33 100644
--- a/lib/base/util.cpp
+++ b/lib/base/util.cpp
@@ -121,9 +121,12 @@ NSAPI_PUBLIC int util_vsnprintf(char *s, int n, register const char
*fmt,
NSAPI_PUBLIC int util_snprintf(char *s, int n, const char *fmt, ...)
{
+ int rc;
va_list args;
va_start(args, fmt);
- return PR_vsnprintf(s, n, fmt, args);
+ rc = PR_vsnprintf(s, n, fmt, args);
+ va_end(args);
+ return rc;
}
NSAPI_PUBLIC int util_vsprintf(char *s, register const char *fmt, va_list args)
@@ -133,9 +136,12 @@ NSAPI_PUBLIC int util_vsprintf(char *s, register const char *fmt,
va_list args)
NSAPI_PUBLIC int util_sprintf(char *s, const char *fmt, ...)
{
+ int rc;
va_list args;
va_start(args, fmt);
- return PR_vsnprintf(s, UTIL_PRF_MAXSIZE, fmt, args);
+ rc = PR_vsnprintf(s, UTIL_PRF_MAXSIZE, fmt, args);
+ va_end(args);
+ return rc;
}
/* --------------------------- util_strcasecmp ---------------------------- */
diff --git a/lib/libaccess/nseframe.cpp b/lib/libaccess/nseframe.cpp
index b29e420..4a023e1 100644
--- a/lib/libaccess/nseframe.cpp
+++ b/lib/libaccess/nseframe.cpp
@@ -230,6 +230,7 @@ NSEFrame_t * nserrGenerate(NSErr_t * errp, long retcode, long
errorid,
esp = va_arg(ap, char *);
efp->ef_errv[i] = STRDUP(esp);
}
+ va_end(ap);
/* Add the frame to the list (if any) */
if (errp) {