RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 04-Aug-2013 20:59:17
Branch: rpm-5_4 Handle: 2013080418591700
Modified files: (Branch: rpm-5_4)
rpm/lib tevr.c
Log:
- coverity #1060669.
Summary:
Revision Changes Path
2.5.4.2 +4 -1 rpm/lib/tevr.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/tevr.c
============================================================================
$ cvs diff -u -r2.5.4.1 -r2.5.4.2 tevr.c
--- rpm/lib/tevr.c 15 Apr 2012 21:20:58 -0000 2.5.4.1
+++ rpm/lib/tevr.c 4 Aug 2013 18:59:17 -0000 2.5.4.2
@@ -1,4 +1,5 @@
#include "system.h"
+
#include <rpmio.h>
#include <poptIO.h>
#include <argv.h>
@@ -206,9 +207,10 @@
evr->str = _free(evr->str);
}
- (void) argvSort(dict->av, rpmdictCmp);
+ (void) argvSort(dict->av,(int (*)(const char **, const char
**))rpmdictCmp);
/* Compute size of string & uuid store. */
+ if (av != NULL)
for (i = 0; av[i] != NULL; i++) {
s.strnb += sizeof(*av) + strlen(av[i]) + 1;
s.uuidnb += 64/8;
@@ -216,6 +218,7 @@
s.strnb += sizeof(*av) + 1;
/* Compute size of dictionary store. */
+ if (dict->av != NULL)
for (i = 0; dict->av[i] != NULL; i++) {
s.dictnb += sizeof(*dict->av) + strlen(dict->av[i]) + 1;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
