summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2010-07-01 16:31:27 -0600
committerRich Megginson <rmeggins@redhat.com>2010-07-01 16:50:18 -0600
commit487413c0584081de05a3fd794f30d03de99c00b0 (patch)
treeae3df9f5e9e385db8d0d4b544a86110f8f5c0106
parente4ca30c3b247073c0a31a7ba1b356a5b7beb01b4 (diff)
downloadds-bug610276.tar.gz
ds-bug610276.tar.xz
ds-bug610276.zip
Bug 610276 - fix coverity Defect Type: API usage errors issuesbug610276
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
-rw-r--r--lib/base/util.cpp10
-rw-r--r--lib/libaccess/nseframe.cpp1
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/base/util.cpp b/lib/base/util.cpp
index 7e9bdbdf..d3a7c330 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 b29e420f..4a023e1d 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) {