date:20130626

[CVS] RPM: popt/ CHANGES README lookup3.c popt.3 popt.h

2013-06-26 Thread Pinto Elia

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: popt Date:   26-Jun-2013 17:16:21
  Branch: HEAD Handle: 2013062615162100

  Modified files:
poptCHANGES README lookup3.c popt.3 popt.h

  Log:
Fix misspelling

Fix misspelling using  http://github.com/lyda/misspell-check

  Summary:
RevisionChanges Path
1.181   +2  -0  popt/CHANGES
1.4 +1  -1  popt/README
1.3 +3  -3  popt/lookup3.c
1.23+4  -4  popt/popt.3
1.81+1  -1  popt/popt.h
  

  patch -p0 <<'@@ .'
  Index: popt/CHANGES
  
  $ cvs diff -u -r1.180 -r1.181 CHANGES
  --- popt/CHANGES  11 Sep 2012 16:10:46 -  1.180
  +++ popt/CHANGES  26 Jun 2013 15:16:21 -  1.181
  @@ -1,4 +1,6 @@
   1.17 -> 2.0:
  +- devzero2000: fix misspelling
  +  Fix misspelling using  http://github.com/lyda/misspell-check
   - devzero2000: quote AC_PREREQ in configure.ac
 for a old bug autoupdate don't do it before autoconf v2.66
 
(http://lists.gnu.org/archive/html/autoconf-patches/2010-06/msg00014.html)
  @@ .
  patch -p0 <<'@@ .'
  Index: popt/README
  
  $ cvs diff -u -r1.3 -r1.4 README
  --- popt/README   14 Jun 2007 08:27:53 -  1.3
  +++ popt/README   26 Jun 2013 15:16:21 -  1.4
  @@ -1,4 +1,4 @@
  -This is the popt(3) command line option parsing library. While it is similiar
  +This is the popt(3) command line option parsing library. While it is similar
   to getopt(3), it contains a number of enhancements, including:
   
1) popt is fully reentrant
  @@ .
  patch -p0 <<'@@ .'
  Index: popt/lookup3.c
  
  $ cvs diff -u -r1.2 -r1.3 lookup3.c
  --- popt/lookup3.c29 Nov 2010 13:44:28 -  1.2
  +++ popt/lookup3.c26 Jun 2013 15:16:21 -  1.3
  @@ -275,7 +275,7 @@
 * rest of the string.  Every machine with memory protection I've seen
 * does it on word boundaries, so is OK with this.  But VALGRIND will
 * still catch it and complain.  The masking trick does make the hash
  -  * noticably faster for short strings (like English words).
  +  * noticeably faster for short strings (like English words).
 */
   #ifndef VALGRIND
   
  @@ -481,7 +481,7 @@
 * rest of the string.  Every machine with memory protection I've seen
 * does it on word boundaries, so is OK with this.  But VALGRIND will
 * still catch it and complain.  The masking trick does make the hash
  -  * noticably faster for short strings (like English words).
  +  * noticeably faster for short strings (like English words).
 */
   #ifndef VALGRIND
   
  @@ -685,7 +685,7 @@
 * rest of the string.  Every machine with memory protection I've seen
 * does it on word boundaries, so is OK with this.  But VALGRIND will
 * still catch it and complain.  The masking trick does make the hash
  -  * noticably faster for short strings (like English words).
  +  * noticeably faster for short strings (like English words).
 */
   #ifndef VALGRIND
   
  @@ .
  patch -p0 <<'@@ .'
  Index: popt/popt.3
  
  $ cvs diff -u -r1.22 -r1.23 popt.3
  --- popt/popt.3   2 May 2011 10:16:40 -   1.22
  +++ popt/popt.3   26 Jun 2013 15:16:21 -  1.23
  @@ -210,7 +210,7 @@
   the argument will not be shown in help output.
   .sp
   If the \fIargInfo\fR value is bitwise or'd with 
\fBPOPT_ARGFLAG_SHOW_DEFAULT\fR,
  -the inital value of the arg will be shown in help output.
  +the initial value of the arg will be shown in help output.
   .sp
   The final structure in the table should have all the pointer values set
   .RB "to " NULL " and all the arithmetic values set to 0, marking the "
  @@ -233,7 +233,7 @@
   contain a overall description of the option table being included.
   .sp
   The other special option table entry type tells popt to call a function (a
  -callback) when any option in that table is found. This is especially usefull
  +callback) when any option in that table is found. This is especially useful
   when included option tables are being used, as the program which provides
   the top-level option table doesn't need to be aware of the other options
   which are provided by the included table. When a callback is set for

[CVS] RPM: rpm-5_4: rpm/lib/ psm.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 19:21:03
  Branch: rpm-5_4  Handle: 2013062617210300

  Modified files:   (Branch: rpm-5_4)
rpm/lib psm.c

  Log:
- coverity #1035724

  Summary:
RevisionChanges Path
2.399.2.7   +2  -2  rpm/lib/psm.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.399.2.6 -r2.399.2.7 psm.c
  --- rpm/lib/psm.c 3 Dec 2012 19:48:55 -   2.399.2.6
  +++ rpm/lib/psm.c 26 Jun 2013 17:21:03 -  2.399.2.7
  @@ -190,8 +190,8 @@
   if (rc != RPMRC_OK) {
if (Access(N, W_OK))
rpmlog(RPMLOG_ERR, _("cannot write to %%%s %s\n"), t, N);
  - else if (fi)
  - Chown(N, fi->uid, fi->gid);
  + else if (fi && Chown(N, fi->uid, fi->gid)) /* XXX coverity #1035724 */
  + rpmlog(RPMLOG_ERR, _("cannot chown %%%s %s\n"), t, N);
   }
   
   if (fn)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ psm.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 19:36:10
  Branch: rpm-5_4  Handle: 2013062617361000

  Modified files:   (Branch: rpm-5_4)
rpm/lib psm.c

  Log:
- coverity #1035772

  Summary:
RevisionChanges Path
2.399.2.8   +9  -4  rpm/lib/psm.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.399.2.7 -r2.399.2.8 psm.c
  --- rpm/lib/psm.c 26 Jun 2013 17:21:03 -  2.399.2.7
  +++ rpm/lib/psm.c 26 Jun 2013 17:36:10 -  2.399.2.8
  @@ -625,10 +625,15 @@
*ssp |= (RPMSCRIPT_STATE_EMBEDDED|RPMSCRIPT_STATE_EXEC);
   
   av[0] = (char *) Phe->p.argv[0];
  -if (arg1 >= 0)
  - (void) sprintf((av[1] = (char *) alloca(32)), "%d", arg1);
  -if (arg2 >= 0)
  - (void) sprintf((av[2] = (char *) alloca(32)), "%d", arg2);
  +/* XXX coverity #1035772 */
  +if (arg1 >= 0) {
  + av[1] = (char *) alloca(32);
  + (void) sprintf(av[1], "%d", arg1);
  +}
  +if (arg2 >= 0) {
  + av[2] = (char *) alloca(32);
  + (void) sprintf(av[2], "%d", arg2);
  + }
   
   #if defined(WITH_LUA)
   if (!strcmp(Phe->p.argv[0], "")) {
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ rpmrc.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 19:24:55
  Branch: rpm-5_4  Handle: 2013062617245400

  Modified files:   (Branch: rpm-5_4)
rpm/lib rpmrc.c

  Log:
- coverity #1035744

  Summary:
RevisionChanges Path
2.289.4.3   +2  -4  rpm/lib/rpmrc.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrc.c
  
  $ cvs diff -u -r2.289.4.2 -r2.289.4.3 rpmrc.c
  --- rpm/lib/rpmrc.c   15 Apr 2012 21:20:58 -  2.289.4.2
  +++ rpm/lib/rpmrc.c   26 Jun 2013 17:24:54 -  2.289.4.3
  @@ -1026,10 +1026,8 @@
}
if (t->cache.cache) {
for (j = 0; j < t->cache.size; j++) {
  - machCacheEntry e;
  - e = t->cache.cache + j;
  - if (e == NULL)
  - /*@innercontinue@*/ continue;
  + /* XXX coverity #1035744 */
  + machCacheEntry e = t->cache.cache + j;
e->name = _free(e->name);
if (e->equivs) {
for (k = 0; k < e->count; k++)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ fsm.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 19:44:54
  Branch: rpm-5_4  Handle: 2013062617445400

  Modified files:   (Branch: rpm-5_4)
rpm/lib fsm.c

  Log:
- coverity #1035927

  Summary:
RevisionChanges Path
2.193.4.5   +2  -1  rpm/lib/fsm.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/fsm.c
  
  $ cvs diff -u -r2.193.4.4 -r2.193.4.5 fsm.c
  --- rpm/lib/fsm.c 25 Jun 2013 00:43:45 -  2.193.4.4
  +++ rpm/lib/fsm.c 26 Jun 2013 17:44:54 -  2.193.4.5
  @@ -806,13 +806,14 @@
   int rc = 0;
   int i = fsm->ix;
   
  +assert(fi);  /* XXX coverity #1035927 */
   fsm->osuffix = NULL;
   fsm->nsuffix = NULL;
   fsm->astriplen = 0;
   fsm->action = FA_UNKNOWN;
   fsm->mapFlags = fi->mapflags;
   
  -if (fi && i >= 0 && i < (int)fi->fc) {
  +if (i >= 0 && i < (int)fi->fc) {
   
fsm->astriplen = fi->astriplen;
fsm->action = (fi->actions ? fi->actions[i] : fi->action);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ rpmfc.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 20:51:30
  Branch: rpm-5_4  Handle: 2013062618513000

  Modified files:   (Branch: rpm-5_4)
rpm/lib rpmfc.c

  Log:
- coverity #1035723

  Summary:
RevisionChanges Path
1.75.2.17   +2  -1  rpm/lib/rpmfc.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfc.c
  
  $ cvs diff -u -r1.75.2.16 -r1.75.2.17 rpmfc.c
  --- rpm/lib/rpmfc.c   7 May 2012 20:57:13 -   1.75.2.16
  +++ rpm/lib/rpmfc.c   26 Jun 2013 18:51:30 -  1.75.2.17
  @@ -856,8 +856,9 @@
   
   if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
defaultdocdir = rpmExpand("%{?_defaultdocdir}", NULL);
  + /* XXX coverity #1035723 */
if (defaultdocdir == NULL || *defaultdocdir == '\0') 
  -defaultdocdir = "/usr/share/doc";
  +defaultdocdir = xstrdup("/usr/share/doc");
   
if (strncmp(fn, defaultdocdir, sizeof(defaultdocdir)-1)) {
if (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ query.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 21:02:34
  Branch: rpm-5_4  Handle: 2013062619023400

  Modified files:   (Branch: rpm-5_4)
rpm/lib query.c

  Log:
- coverity #1035850

  Summary:
RevisionChanges Path
2.216.2.8   +5  -3  rpm/lib/query.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/query.c
  
  $ cvs diff -u -r2.216.2.7 -r2.216.2.8 query.c
  --- rpm/lib/query.c   8 May 2012 00:07:18 -   2.216.2.7
  +++ rpm/lib/query.c   26 Jun 2013 19:02:34 -  2.216.2.8
  @@ -575,7 +575,8 @@
   
   case RPMQV_SOURCEPKGID:
   case RPMQV_PKGID:
  -{unsigned char MD5[16];
  +#define  MD5len  128/8   /* XXX coverity #1035850 */
  +{unsigned char MD5[MD5len+1];
unsigned char * t;
rpmuint32_t tag;
   
  @@ -587,12 +588,12 @@
}
   
MD5[0] = '\0';
  -for (i = 0, t = MD5, s = arg; i < 16; i++, t++, s += 2)
  +for (i = 0, t = MD5, s = arg; i < MD5len; i++, t++, s += 2)
   *t = (nibble(s[0]) << 4) | nibble(s[1]);

tag = (qva->qva_source == RPMQV_PKGID
? RPMTAG_SOURCEPKGID : RPMTAG_PKGID);
  - qva->qva_mi = rpmtsInitIterator(ts, (rpmTag) tag, MD5, sizeof(MD5));
  + qva->qva_mi = rpmtsInitIterator(ts, (rpmTag) tag, MD5, MD5len);
if (qva->qva_mi == NULL) {
rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"),
"pkgid", arg);
  @@ -600,6 +601,7 @@
} else
res = rpmcliShowMatches(qva, ts);
   }break;
  +#undef   MD5len
   
   case RPMQV_HDRID:
for (i = 0, s = arg; *s && isxdigit(*s); s++, i++)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmdb/ hdrfmt.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 21:08:10
  Branch: rpm-5_4  Handle: 2013062619080900

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   hdrfmt.c

  Log:
- coverity #103583

  Summary:
RevisionChanges Path
1.151.2.13  +2  -2  rpm/rpmdb/hdrfmt.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  
  $ cvs diff -u -r1.151.2.12 -r1.151.2.13 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c29 May 2012 17:42:29 -  1.151.2.12
  +++ rpm/rpmdb/hdrfmt.c26 Jun 2013 19:08:09 -  1.151.2.13
  @@ -4640,8 +4640,8 @@
   if (!(av && av[0] && *av[0]))
av = avdefault;
   for (i = 0; av[i] != NULL; i++) {
  - char b[BUFSIZ];
  - size_t nb = sizeof(b);
  + char b[BUFSIZ+1];   /* XXX coverity #103583 */
  + size_t nb = sizeof(b)-1;
char * nval;
rpmuint32_t keyval = keyValue(keyStat, nkeyStat, av[i]);
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/build/ pack.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 21:14:12
  Branch: rpm-5_4  Handle: 2013062619141100

  Modified files:   (Branch: rpm-5_4)
rpm/build   pack.c

  Log:
- coverity #103595

  Summary:
RevisionChanges Path
2.324.2.4   +2  -2  rpm/build/pack.c
  

  patch -p0 <<'@@ .'
  Index: rpm/build/pack.c
  
  $ cvs diff -u -r2.324.2.3 -r2.324.2.4 pack.c
  --- rpm/build/pack.c  25 Jun 2013 16:07:33 -  2.324.2.3
  +++ rpm/build/pack.c  26 Jun 2013 19:14:11 -  2.324.2.4
  @@ -1324,7 +1324,7 @@
   #endif
   
   /* Add build scriptlet status/time (if any) to SRPM's. */
  -{int ix;
  +{size_t ix;  /* XXX coverity #1035951 */
for (ix = 0; ix < RPMSCRIPT_MAX; ix++) {
if (spec->sstates[ix] == 0)
continue;
  @@ -1332,7 +1332,7 @@
continue;
break;
}
  - if (ix >= 0 && ix < RPMSCRIPT_MAX) {
  + if (ix < RPMSCRIPT_MAX) {
he->tag = RPMTAG_SCRIPTSTATES;
he->t = RPM_UINT32_TYPE;
he->p.ui32p = spec->sstates;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ rpmds.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 21:19:49
  Branch: rpm-5_4  Handle: 2013062619194900

  Modified files:   (Branch: rpm-5_4)
rpm/lib rpmds.c

  Log:
- coverity #1035879

  Summary:
RevisionChanges Path
2.170.2.20  +4  -1  rpm/lib/rpmds.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmds.c
  
  $ cvs diff -u -r2.170.2.19 -r2.170.2.20 rpmds.c
  --- rpm/lib/rpmds.c   6 Jun 2012 21:25:04 -   2.170.2.19
  +++ rpm/lib/rpmds.c   26 Jun 2013 19:19:49 -  2.170.2.20
  @@ -4010,8 +4010,11 @@
   /*@-mods@*/
evr_tuple_order = rpmExpand("%{?evr_tuple_order}", NULL);
   /*@=mods@*/
  - if (evr_tuple_order == NULL || evr_tuple_order[0] == '\0')
  + if (evr_tuple_order == NULL || evr_tuple_order[0] == '\0') {
  + /* XXX coverity #1035879 */
  + evr_tuple_order = _free(evr_tuple_order);
evr_tuple_order = xstrdup("EVR");
  + }
   }
   assert(evr_tuple_order != NULL && evr_tuple_order[0] != '\0');
   /*@-freshtrans@*/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ rpmfc.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 21:24:19
  Branch: rpm-5_4  Handle: 2013062619241900

  Modified files:   (Branch: rpm-5_4)
rpm/lib rpmfc.c

  Log:
- coverity #1035883

  Summary:
RevisionChanges Path
1.75.2.18   +1  -0  rpm/lib/rpmfc.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfc.c
  
  $ cvs diff -u -r1.75.2.17 -r1.75.2.18 rpmfc.c
  --- rpm/lib/rpmfc.c   26 Jun 2013 18:51:30 -  1.75.2.17
  +++ rpm/lib/rpmfc.c   26 Jun 2013 19:24:19 -  1.75.2.18
  @@ -857,6 +857,7 @@
   if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
defaultdocdir = rpmExpand("%{?_defaultdocdir}", NULL);
/* XXX coverity #1035723 */
  + /* XXX coverity #1035883 */
if (defaultdocdir == NULL || *defaultdocdir == '\0') 
   defaultdocdir = xstrdup("/usr/share/doc");
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ rpminstall.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 21:27:31
  Branch: rpm-5_4  Handle: 2013062619273000

  Modified files:   (Branch: rpm-5_4)
rpm/lib rpminstall.c

  Log:
- coverity #1035884

  Summary:
RevisionChanges Path
1.229.2.7   +2  -0  rpm/lib/rpminstall.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpminstall.c
  
  $ cvs diff -u -r1.229.2.6 -r1.229.2.7 rpminstall.c
  --- rpm/lib/rpminstall.c  26 Apr 2012 17:46:50 -  1.229.2.6
  +++ rpm/lib/rpminstall.c  26 Jun 2013 19:27:30 -  1.229.2.7
  @@ -647,6 +647,7 @@
default:
rpmlog(RPMLOG_ERR, _("package \"%s\" cannot be erased\n"), fn);
numFailed++;/* XXX multiple erasures? */
  + fn = _free(fn); /* XXX coverity #1035884 */
goto exit;
/*@notreached@*/ /*@switchbreak@*/ break;
}
  @@ -674,6 +675,7 @@
   _("package %s is not relocatable\n"), he->p.str);
he->p.ptr = _free(he->p.ptr);
numFailed++;
  + fn = _free(fn); /* XXX coverity #1035884 */
goto exit;
/*@notreached@*/
}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmconstant/ rpmconstant.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 21:30:48
  Branch: rpm-5_4  Handle: 2013062619304800

  Modified files:   (Branch: rpm-5_4)
rpm/rpmconstant rpmconstant.c

  Log:
- coverity #1035889

  Summary:
RevisionChanges Path
1.9.6.1 +2  -2  rpm/rpmconstant/rpmconstant.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmconstant/rpmconstant.c
  
  $ cvs diff -u -r1.9 -r1.9.6.1 rpmconstant.c
  --- rpm/rpmconstant/rpmconstant.c 18 Aug 2008 10:57:58 -  1.9
  +++ rpm/rpmconstant/rpmconstant.c 26 Jun 2013 19:30:48 -  1.9.6.1
  @@ -1,5 +1,5 @@
   /* Nanar 
  - * $Id: rpmconstant.c,v 1.9 2008/08/18 10:57:58 nanardon Exp $
  + * $Id: rpmconstant.c,v 1.9.6.1 2013/06/26 19:30:48 jbj Exp $
*/
   
   #include "system.h"
  @@ -87,7 +87,7 @@
   char * lccontext = strdup(context);
   char * ptr;
   int rc = 0;
  -if (!context) return 0; /* programmer error */
  +if (context) /* XXX coverity #1035889 */
   for (ptr = lccontext; *ptr != 0; ptr++)
   *ptr = (char)tolower(*ptr);
   rpmconstInitL(c);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmdb/ rpmevr.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 21:34:26
  Branch: rpm-5_4  Handle: 2013062619342600

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   rpmevr.c

  Log:
- coverity #1035894

  Summary:
RevisionChanges Path
1.37.2.10   +3  -1  rpm/rpmdb/rpmevr.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmevr.c
  
  $ cvs diff -u -r1.37.2.9 -r1.37.2.10 rpmevr.c
  --- rpm/rpmdb/rpmevr.c6 Jun 2012 21:25:03 -   1.37.2.9
  +++ rpm/rpmdb/rpmevr.c26 Jun 2013 19:34:26 -  1.37.2.10
  @@ -161,8 +161,10 @@
   if (evr_tuple_mire == NULL) {
int xx;
evr_tuple_match = rpmExpand("%{?evr_tuple_match}", NULL);
  - if (evr_tuple_match == NULL || evr_tuple_match[0] == '\0')
  + if (evr_tuple_match == NULL || evr_tuple_match[0] == '\0') {
  + evr_tuple_match = _free(_evr_tuple_match); /* XXX coverity #1035894 
*/
evr_tuple_match = xstrdup(_evr_tuple_match);
  + }
   
evr_tuple_mire = mireNew(RPMMIRE_REGEX, 0);
xx = mireSetCOptions(evr_tuple_mire, RPMMIRE_REGEX, 0, 0, NULL);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmdb/ rpmevr.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 21:40:05
  Branch: rpm-5_4  Handle: 2013062619400500

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   rpmevr.c

  Log:
- coverity #1035895

  Summary:
RevisionChanges Path
1.37.2.11   +4  -2  rpm/rpmdb/rpmevr.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmevr.c
  
  $ cvs diff -u -r1.37.2.10 -r1.37.2.11 rpmevr.c
  --- rpm/rpmdb/rpmevr.c26 Jun 2013 19:34:26 -  1.37.2.10
  +++ rpm/rpmdb/rpmevr.c26 Jun 2013 19:40:05 -  1.37.2.11
  @@ -162,7 +162,7 @@
int xx;
evr_tuple_match = rpmExpand("%{?evr_tuple_match}", NULL);
if (evr_tuple_match == NULL || evr_tuple_match[0] == '\0') {
  - evr_tuple_match = _free(_evr_tuple_match); /* XXX coverity #1035894 
*/
  + evr_tuple_match = _free(evr_tuple_match); /* XXX coverity #1035894 
*/
evr_tuple_match = xstrdup(_evr_tuple_match);
}
   
  @@ -265,8 +265,10 @@
   /*@-globs -internalglobs -mods @*/
   if (evr_tuple_order == NULL) {
evr_tuple_order = rpmExpand("%{?evr_tuple_order}", NULL);
  - if (evr_tuple_order == NULL || evr_tuple_order[0] == '\0')
  + if (evr_tuple_order == NULL || evr_tuple_order[0] == '\0') {
  + evr_tuple_order = _free(evr_tuple_order); /* XXX coverity #1035895 
*/
evr_tuple_order = xstrdup("EVR");
  + }
   }
   /*@=globs =internalglobs =mods @*/
   assert(evr_tuple_order != NULL && evr_tuple_order[0] != '\0');
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmdb/ rpmevr.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 21:43:15
  Branch: rpm-5_4  Handle: 2013062619431500

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   rpmevr.c

  Log:
- avoid some const relocations.

  Summary:
RevisionChanges Path
1.37.2.12   +4  -2  rpm/rpmdb/rpmevr.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmevr.c
  
  $ cvs diff -u -r1.37.2.11 -r1.37.2.12 rpmevr.c
  --- rpm/rpmdb/rpmevr.c26 Jun 2013 19:40:05 -  1.37.2.11
  +++ rpm/rpmdb/rpmevr.c26 Jun 2013 19:43:15 -  1.37.2.12
  @@ -147,7 +147,7 @@
   }
   
   /*@unchecked@*/ /*@observer@*/ /*@null@*/
  -static const char * _evr_tuple_match =
  +static const char _evr_tuple_match[] =
"^(?:([^:-]+):)?([^:-]+)(?:-([^:-]+))?(?::([^:-]+))?$";
   /*@unchecked@*/ /*@only@*/ /*@observer@*/ /*@null@*/
   const char * evr_tuple_match = NULL;
  @@ -251,6 +251,8 @@
   return rpmvercmp(a, b);
   }
   
  +/*@unchecked@*/ /*@observer@*/ /*@null@*/
  +static const char _evr_tuple_order[] = "EVR";
   /*@unchecked@*/ /*@only@*/ /*@observer@*/ /*@null@*/
   static const char * evr_tuple_order = NULL;
   
  @@ -267,7 +269,7 @@
evr_tuple_order = rpmExpand("%{?evr_tuple_order}", NULL);
if (evr_tuple_order == NULL || evr_tuple_order[0] == '\0') {
evr_tuple_order = _free(evr_tuple_order); /* XXX coverity #1035895 
*/
  - evr_tuple_order = xstrdup("EVR");
  + evr_tuple_order = xstrdup(_evr_tuple_order);
}
   }
   /*@=globs =internalglobs =mods @*/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmsql.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 22:39:43
  Branch: rpm-5_4  Handle: 2013062620394300

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio   rpmsql.c

  Log:
- coverity #1035922

  Summary:
RevisionChanges Path
2.59.2.6+3  -0  rpm/rpmio/rpmsql.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsql.c
  
  $ cvs diff -u -r2.59.2.5 -r2.59.2.6 rpmsql.c
  --- rpm/rpmio/rpmsql.c13 Jun 2012 23:07:36 -  2.59.2.5
  +++ rpm/rpmio/rpmsql.c26 Jun 2013 20:39:43 -  2.59.2.6
  @@ -3756,9 +3756,12 @@
goto exit;
   
zSelect = appendText(zSelect, "SELECT 'INSERT INTO ' || ", 0);
  +
zTmp = appendText(zTmp, zTable, '"');
if (zTmp)
zSelect = appendText(zSelect, zTmp, '\'');
  + zTmp = _free(zTmp); /* XXX coverity #1035922 */
  + 
zSelect = appendText(zSelect, " || ' VALUES(' || ", 0);
rc = rpmsqlCmd(sql, "step", db,
sqlite3_step(pTableInfo));
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpgp.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 22:44:32
  Branch: rpm-5_4  Handle: 2013062620443200

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio   rpmpgp.c

  Log:
- coverity #1035921

  Summary:
RevisionChanges Path
2.127.2.2   +4  -0  rpm/rpmio/rpmpgp.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.127.2.1 -r2.127.2.2 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c16 Apr 2012 20:53:33 -  2.127.2.1
  +++ rpm/rpmio/rpmpgp.c26 Jun 2013 20:44:32 -  2.127.2.2
  @@ -1538,11 +1538,15 @@
crc = pgpCRC(dec, declen);
if (crcpkt != crc) {
ec = PGPARMOR_ERR_CRC_CHECK;
  + dec = _free(dec);   /* XXX coverity #1035921 */
  + declen = 0;
goto exit;
}
iob->b = _free(iob->b);
iob->b = dec;
iob->blen = declen;
  + dec = NULL;
  + declen = 0;
goto exit;
/*@notreached@*/ /*@switchbreak@*/ break;
}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmhkp.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 22:49:29
  Branch: rpm-5_4  Handle: 2013062620492900

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio   rpmhkp.c

  Log:
- coverity #1035902

  Summary:
RevisionChanges Path
2.20.2.3+1  -1  rpm/rpmio/rpmhkp.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmhkp.c
  
  $ cvs diff -u -r2.20.2.2 -r2.20.2.3 rpmhkp.c
  --- rpm/rpmio/rpmhkp.c4 Jun 2012 15:10:21 -   2.20.2.2
  +++ rpm/rpmio/rpmhkp.c26 Jun 2013 20:49:29 -  2.20.2.3
  @@ -447,6 +447,7 @@
   {char * keyname = rpmExpand("0x", pgpHexStr(signid, 8), NULL);
rpmhkp ohkp = rpmhkpLookup(keyname);
   
  + keyname = _free(keyname);   /* XXX coverity #1035902 */
if (ohkp == NULL) {
xx = rpmbfAdd(hkp->awol, signid, 8);
   DESPEW((stderr, "\tAWOL\n"));
  @@ -457,7 +458,6 @@
if (rpmhkpLoadKey(ohkp, dig, 0, sigp->pubkey_algo))
keyx = -2;  /* XXX skip V2 certs */
ohkp = rpmhkpFree(ohkp);
  - keyname = _free(keyname);
   }
   
   exit:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ rpmmtree.c

2013-06-26 Thread Jeff Johnson

  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:   26-Jun-2013 23:09:58
  Branch: rpm-5_4  Handle: 2013062621095700

  Modified files:   (Branch: rpm-5_4)
rpm/tools   rpmmtree.c

  Log:
- coverity #978437

  Summary:
RevisionChanges Path
2.17.2.2+6  -2  rpm/tools/rpmmtree.c
  

  patch -p0 <<'@@ .'
  Index: rpm/tools/rpmmtree.c
  
  $ cvs diff -u -r2.17.2.1 -r2.17.2.2 rpmmtree.c
  --- rpm/tools/rpmmtree.c  25 Jun 2013 00:28:25 -  2.17.2.1
  +++ rpm/tools/rpmmtree.c  26 Jun 2013 21:09:57 -  2.17.2.2
  @@ -1816,8 +1816,12 @@
   }
   
   #if defined(HAVE_STRUCT_STAT_ST_FLAGS)
  -if (KF_ISSET(keys, FLAGS))
  - printf(" flags=%s", flags_to_string(n->sb.st_flags));
  +if (KF_ISSET(keys, FLAGS)) {
  + /* XXX coverity #978437 */
  + const char * fflags = flags_to_string(n->sb.st_flags);
  + printf(" flags=%s", fflags);
  + fflags = _free(fflags);
  +}
   #endif
   printf("\n");
   }
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: popt/ CHANGES README lookup3.c popt.3 popt.h

[CVS] RPM: rpm-5_4: rpm/lib/ psm.c

[CVS] RPM: rpm-5_4: rpm/lib/ psm.c

[CVS] RPM: rpm-5_4: rpm/lib/ rpmrc.c

[CVS] RPM: rpm-5_4: rpm/lib/ fsm.c

[CVS] RPM: rpm-5_4: rpm/lib/ rpmfc.c

[CVS] RPM: rpm-5_4: rpm/lib/ query.c

[CVS] RPM: rpm-5_4: rpm/rpmdb/ hdrfmt.c

[CVS] RPM: rpm-5_4: rpm/build/ pack.c

[CVS] RPM: rpm-5_4: rpm/lib/ rpmds.c

[CVS] RPM: rpm-5_4: rpm/lib/ rpmfc.c

[CVS] RPM: rpm-5_4: rpm/lib/ rpminstall.c

[CVS] RPM: rpm-5_4: rpm/rpmconstant/ rpmconstant.c

[CVS] RPM: rpm-5_4: rpm/rpmdb/ rpmevr.c

[CVS] RPM: rpm-5_4: rpm/rpmdb/ rpmevr.c

[CVS] RPM: rpm-5_4: rpm/rpmdb/ rpmevr.c

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmsql.c

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpgp.c

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmhkp.c

[CVS] RPM: rpm-5_4: rpm/tools/ rpmmtree.c

20 matches

Site Navigation

Mail list logo

Footer information