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

2017-07-16 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:   16-Jul-2017 16:15:25
  Branch: rpm-5_4  Handle: 2017071614152500

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

  Log:
- fix: avoid an overflow.

  Summary:
RevisionChanges Path
2.399.2.30  +1  -1  rpm/lib/psm.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.399.2.29 -r2.399.2.30 psm.c
  --- rpm/lib/psm.c 10 Jul 2017 09:44:00 -  2.399.2.29
  +++ rpm/lib/psm.c 16 Jul 2017 14:15:25 -  2.399.2.30
  @@ -2904,7 +2904,7 @@
if (payload_compressor == NULL)
payload_compressor = xstrdup("gzip");
   
  - psm->rpmio_flags = te = (char *) xmalloc(sizeof("w9.gzdio"));
  + psm->rpmio_flags = te = (char *) xmalloc(sizeof("w9.zstdio")+32);
*te = '\0';
te = stpcpy(te, ((psm->goal == PSM_PKGSAVE) ? "w9" : "r"));
if (!strcmp(payload_compressor, "gzip"))
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2014-10-12 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:   12-Oct-2014 23:20:58
  Branch: rpm-5_4  Handle: 2014101221205404

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

  Log:
- psm: merge some PLD patches.
- js: stub in mozjs-{24,31} goop.

  Summary:
RevisionChanges Path
2.399.2.19  +15 -7  rpm/lib/psm.c
2.170.2.29  +5  -1  rpm/lib/rpmds.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.399.2.18 -r2.399.2.19 psm.c
  --- rpm/lib/psm.c 27 Sep 2014 15:53:43 -  2.399.2.18
  +++ rpm/lib/psm.c 12 Oct 2014 21:20:54 -  2.399.2.19
  @@ -27,7 +27,10 @@
   #include 
   #include 
   
  -#if defined(WITH_LUA) || defined(WITH_AUGEAS) || defined(WITH_FICL) || 
defined(WITH_GPSEE) || defined(WITH_MRBEMBED) || defined(WITH_PERLEMBED) || 
defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SEMANAGE) 
|| defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
  +#if defined(WITH_GPSEE) || defined(WITH_MOZJS185) || defined(WITH_MOZJS24) 
|| defined(WITH_MOZJS31)
  +#define  WITH_MOZJS  1
  +#endif
  +#if defined(WITH_LUA) || defined(WITH_AUGEAS) || defined(WITH_FICL) || 
defined(WITH_MOZJS) || defined(WITH_MRBEMBED) || defined(WITH_PERLEMBED) || 
defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SEMANAGE) 
|| defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
   #define  _WITH_EMBEDDED
   #else
   #undef _WITH_ENBEDDED
  @@ -687,7 +690,7 @@
jni = rpmjniFree(jni);
   } else
   #endif
  -#if defined(WITH_GPSEE)
  +#if defined(WITH_MOZJS)
   if (!strcmp(Phe->p.argv[0], "")) {
rpmjs js = rpmjsNew((char **)av, 0);
rc = rpmjsRun(js, script, NULL) == RPMRC_OK
  @@ -1499,11 +1502,16 @@
ARGint_t vals;
   
depName = _free(depName);
  - depName = (char *) xmalloc(nName + 1 + 1);
  - (void) stpcpy(depName, Name);
  - /* XXX re-add the pesky trailing '/' to dirnames. */
  - depName[nName] = (tagno == RPMTAG_DIRNAMES ? '/' : '\0');
  - depName[nName+1] = '\0';
  +
  + if (!strcmp(Name, "/"))
  + depName = xstrdup(Name);
  + else {
  + depName = (char *) xmalloc(nName + 1 + 1);
  + (void) stpcpy(depName, Name);
  + /* XXX re-add the pesky trailing '/' to dirnames. */
  + depName[nName] = (tagno == RPMTAG_DIRNAMES ? '/' : '\0');
  + depName[nName+1] = '\0';
  + }
   
if (depName[0] == '/' && psm->Tmires != NULL) {
miRE mire;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmds.c
  
  $ cvs diff -u -r2.170.2.28 -r2.170.2.29 rpmds.c
  --- rpm/lib/rpmds.c   27 Sep 2014 15:53:43 -  2.170.2.28
  +++ rpm/lib/rpmds.c   12 Oct 2014 21:20:58 -  2.170.2.29
  @@ -100,6 +100,10 @@
   
   #include "debug.h"
   
  +#if defined(WITH_GPSEE) || defined(WITH_MOZJS185) || defined(WITH_MOZJS24) 
|| defined(WITH_MOZJS31)
  +#define  WITH_MOZJS  1
  +#endif
  +
   /*@access rpmns @*/
   /*@access EVR_t @*/
   
  @@ -1502,7 +1506,7 @@
(evrFlags)(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
   N_("internal embedded JVM BeanShell.") },
   #endif
  -#if defined(WITH_GPSEE)
  +#if defined(WITH_MOZJS)
   { "rpmlib(BuiltinJavaScript)",   "5.2-1",
(evrFlags)(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
   N_("internal embedded JavaScript.") },
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2014-09-23 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:   23-Sep-2014 20:31:08
  Branch: rpm-5_4  Handle: 2014092318310800

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

  Log:
- clang: fix warnings.

  Summary:
RevisionChanges Path
2.399.2.17  +1  -1  rpm/lib/psm.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.399.2.16 -r2.399.2.17 psm.c
  --- rpm/lib/psm.c 22 Sep 2014 18:16:30 -  2.399.2.16
  +++ rpm/lib/psm.c 23 Sep 2014 18:31:08 -  2.399.2.17
  @@ -536,7 +536,7 @@
if (xx == -1) {
void * ptr = rpmtsNotify(psm->ts, psm->te, RPMCALLBACK_SCRIPT_ERROR,
 psm->scriptTag, 1);
  - ptr = ptr;  /* XXX keep gcc happy. */
  + (void)ptr;  /* XXX keep gcc/clang happy. */
rc = RPMRC_FAIL;
} else
rc = RPMRC_OK;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/lib/ psm.c query.c rpmds.c rpmgi.c rpmts.c

2014-09-22 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:   22-Sep-2014 20:16:31
  Branch: rpm-5_4  Handle: 2014092218163000

  Modified files:   (Branch: rpm-5_4)
rpm/lib psm.c query.c rpmds.c rpmgi.c rpmts.c

  Log:
- gcc: remove clang pragma fluff.

  Summary:
RevisionChanges Path
2.399.2.16  +12 -0  rpm/lib/psm.c
2.216.2.12  +4  -0  rpm/lib/query.c
2.170.2.27  +8  -0  rpm/lib/rpmds.c
2.75.2.10   +4  -0  rpm/lib/rpmgi.c
2.188.2.12  +5  -1  rpm/lib/rpmts.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.399.2.15 -r2.399.2.16 psm.c
  --- rpm/lib/psm.c 18 Sep 2014 02:18:55 -  2.399.2.15
  +++ rpm/lib/psm.c 22 Sep 2014 18:16:30 -  2.399.2.16
  @@ -465,15 +465,19 @@
(unsigned)psm->sq.reaped, psm->sq.status,
(unsigned)msecs/1000, (unsigned)msecs%1000);
   
  +#ifdef   __clang__
   #pragma clang diagnostic push
   #pragma clang diagnostic ignored "-Wtautological-pointer-compare"
  +#endif
   if (psm->sstates != NULL)
   {rpmuint32_t * ssp = psm->sstates + tag2slx(psm->scriptTag);
*ssp &= ~0x;
*ssp |= (psm->sq.status & 0x);
*ssp |= RPMSCRIPT_STATE_REAPED;
   }
  +#ifdef   __clang__
   #pragma clang diagnostic pop
  +#endif
   
   return psm->sq.reaped;
   }
  @@ -629,11 +633,15 @@
   rpmuint32_t * ssp = NULL;
   int inChroot = enterChroot(psm, &pwdFdno, &rootFdno);
   
  +#ifdef   __clang__
   #pragma clang diagnostic push
   #pragma clang diagnostic ignored "-Wtautological-pointer-compare"
  +#endif
   if (psm->sstates != NULL)
ssp = psm->sstates + tag2slx(psm->scriptTag);
  +#ifdef   __clang__
   #pragma clang diagnostic pop
  +#endif
   
   if (ssp != NULL)
*ssp |= (RPMSCRIPT_STATE_EMBEDDED|RPMSCRIPT_STATE_EXEC);
  @@ -836,11 +844,15 @@
   int xx;
   int i;
   
  +#ifdef   __clang__
   #pragma clang diagnostic push
   #pragma clang diagnostic ignored "-Wtautological-pointer-compare"
  +#endif
   if (psm->sstates != NULL && ix >= 0 && ix < RPMSCRIPT_MAX)
ssp = psm->sstates + ix;
  +#ifdef   __clang__
   #pragma clang diagnostic pop
  +#endif
   
   if (ssp != NULL)
*ssp = RPMSCRIPT_STATE_UNKNOWN;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/query.c
  
  $ cvs diff -u -r2.216.2.11 -r2.216.2.12 query.c
  --- rpm/lib/query.c   10 Sep 2014 20:10:05 -  2.216.2.11
  +++ rpm/lib/query.c   22 Sep 2014 18:16:30 -  2.216.2.12
  @@ -340,8 +340,10 @@
te = stpcpy(te, prefix);
   
/* XXX FIXME: call code in rpmdb/hdrfmt.c instead */
  +#ifdef   __clang__
   #pragma clang diagnostic push
   #pragma clang diagnostic ignored "-Wswitch"
  +#endif
if (QVA_ISSET(qva->qva_flags, FOR_STATE)) {
switch (fstate) {
case RPMFILE_STATE_NORMAL:
  @@ -368,7 +370,9 @@
/*@switchbreak@*/ break;
}
}
  +#ifdef   __clang__
   #pragma clang diagnostic pop
  +#endif
   
if (QVA_ISSET(qva->qva_flags, FOR_DUMPFILES)) {
sprintf(te, "%s %d %d %s 0%o ",
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmds.c
  
  $ cvs diff -u -r2.170.2.26 -r2.170.2.27 rpmds.c
  --- rpm/lib/rpmds.c   10 Sep 2014 20:10:05 -  2.170.2.26
  +++ rpm/lib/rpmds.c   22 Sep 2014 18:16:30 -  2.170.2.27
  @@ -154,10 +154,14 @@
   case RPMTAG_DIRNAMES:Type = "Dirs";  break;
   case RPMTAG_BASENAMES:   Type = "Files"; break;
   case RPMTAG_FILELINKTOS: Type = "Linktos";   break;
  +#ifdef   __clang__
   #pragma clang diagnostic push
   #pragma clang diagnostic ignored "-Wswitch"
  +#endif
   case 0:  Type = "Unknown";   break;
  +#ifdef   __clang__
   #pragma clang diagnostic pop
  +#endif
   }
   return Type;
   }
  @@ -3820,8 +3824,10 @@
un = &myun;
   }
   
  +#ifdef   __clang__
   #pragma clang diagnostic push
   #pragma clang diagnostic ignored "-Wtautological-pointer-compare"
  +#endif
   /*@-type@*/
   /* XXX values need to be checked for EVR (i.e. no '-' character.) */
   if (un->sysname != NULL)
  @@ -3841,7 +3847,9 @@
rpmdsNSAdd(dsp, NS, "domainname", un->domainname, RPMSENSE_EQUAL);
   #endif
   /*@=type@*/
  +#ifdef   __clang__
   #pragma clang diagnosti

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

2014-09-17 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:   18-Sep-2014 04:18:56
  Branch: rpm-5_4  Handle: 2014091802185500

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

  Log:
 lib: -fsanitize:address fix-up's.

  Summary:
RevisionChanges Path
2.399.2.15  +12 -2  rpm/lib/psm.c
1.240.2.14  +1  -0  rpm/lib/rpmchecksig.c
1.429.2.14  +75 -25 rpm/lib/transaction.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.399.2.14 -r2.399.2.15 psm.c
  --- rpm/lib/psm.c 10 Sep 2014 20:10:05 -  2.399.2.14
  +++ rpm/lib/psm.c 18 Sep 2014 02:18:55 -  2.399.2.15
  @@ -2514,6 +2514,7 @@
/* XXX this is headerCopy w/o headerReload() */
psm->oh = headerNew();
   
  + /* XXX rpm-4.1 and later has archive size in signature header. */
for (hi = headerInit(oh);
 headerNext(hi, he, 0);
 he->p.ptr = _free(he->p.ptr))
  @@ -2546,7 +2547,10 @@
if (nb == 0)
rc = RPMRC_FAIL;
else {
  - void * l = memset(alloca(nb), 0, nb);
  + void * l = NULL;
  +#ifdef   DYING
  + l = memset(alloca(nb), 0, nb);
  +#endif
rc = rpmpkgWrite(item, psm->fd, l, &msg);
}
if (rc != RPMRC_OK) {
  @@ -2561,6 +2565,7 @@
/* Write the signature section into the package. */
/* XXX rpm-4.1 and later has archive size in signature header. */
{   static const char item[] = "Signature";
  + const char * msg = NULL;
Header sigh = headerRegenSigHeader(fi->h, noArchiveSize);
/* Reallocate the signature into one contiguous region. */
sigh = headerReload(sigh, RPMTAG_HEADERSIGNATURES);
  @@ -2569,12 +2574,16 @@
rc = RPMRC_FAIL;
break;
}
  - rc = rpmpkgWrite(item, psm->fd, sigh, NULL);
  + rc = rpmpkgWrite(item, psm->fd, sigh, &msg);
(void)headerFree(sigh);
sigh = NULL;
if (rc != RPMRC_OK) {
  + rpmlog(RPMLOG_ERR, "%s: %s: %s", psm->pkgfn, item,
  + (msg && *msg ? msg : "write failed\n"));
  + msg = _free(msg);
break;
}
  + msg = _free(msg);
}
   
/* Add remove transaction id to header. */
  @@ -2632,6 +2641,7 @@
(msg && *msg ? msg : "write failed\n"));
msg = _free(msg);
}
  + msg = _free(msg);
}
}
break;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  
  $ cvs diff -u -r1.240.2.13 -r1.240.2.14 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c 9 Sep 2014 17:12:06 -   1.240.2.13
  +++ rpm/lib/rpmchecksig.c 18 Sep 2014 02:18:55 -  1.240.2.14
  @@ -444,6 +444,7 @@
{   const char item[] = "Lead";
const char * msg = NULL;
rpmRC rc = rpmpkgWrite(item, ofd, lead, &msg);
  + lead = _free(lead); /* XXX memory leak. */
if (rc != RPMRC_OK) {
rpmlog(RPMLOG_ERR, "%s: %s: %s\n", tfn, item, Fstrerror(ofd));
msg = _free(msg);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/transaction.c
  
  $ cvs diff -u -r1.429.2.13 -r1.429.2.14 transaction.c
  --- rpm/lib/transaction.c 4 Dec 2012 18:48:32 -   1.429.2.13
  +++ rpm/lib/transaction.c 18 Sep 2014 02:18:55 -  1.429.2.14
  @@ -75,22 +75,34 @@
   #define QVA_ISSET(_qvaflags, _FLAG)  ((_qvaflags) & (VERIFY_##_FLAG))
   
   #define VSF_ISSET(_vsflags, _FLAG)   ((_vsflags) & (RPMVSF_##_FLAG))
  -#define VSF_SET(_vsflags, _FLAG) \
  - (*((unsigned *)&(_vsflags)) |= (RPMVSF_##_FLAG))
  -#define VSF_CLR(_vsflags, _FLAG) \
  - (*((unsigned *)&(_vsflags)) &= ~(RPMVSF_##_FLAG))
  +#define VSF_SET(_vsflags, _FLAG) { \
  + unsigned ui = (unsigned)(_vsflags); ui |= (RPMVSF_##_FLAG); \
  + (_vsflags) = (pgpVSFlags) ui; \
  + }
  +#define VSF_CLR(_vsflags, _FLAG) { \
  + unsigned ui = (unsigned)(_vsflags); ui &= ~(RPMVSF_##_FLAG); \
  +

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

2014-08-17 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:   17-Aug-2014 18:50:50
  Branch: rpm-5_4  Handle: 2014081716505000

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

  Log:
- remove compiler warnings.

  Summary:
RevisionChanges Path
2.399.2.13  +11 -6  rpm/lib/psm.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.399.2.12 -r2.399.2.13 psm.c
  --- rpm/lib/psm.c 6 Aug 2014 20:42:34 -   2.399.2.12
  +++ rpm/lib/psm.c 17 Aug 2014 16:50:50 -  2.399.2.13
  @@ -49,10 +49,14 @@
   #define  _RPMPSM_INTERNAL
   #include "psm.h"
   #define F_ISSET(_psm, _FLAG) ((_psm)->flags & (RPMPSM_FLAGS_##_FLAG))
  -#define F_SET(_psm, _FLAG)   \
  - (*((unsigned *)&(_psm)->flags) |=  (RPMPSM_FLAGS_##_FLAG))
  -#define F_CLR(_psm, _FLAG)   \
  - (*((unsigned *)&(_psm)->flags) &= ~(RPMPSM_FLAGS_##_FLAG))
  +#define F_SET(_psm, _FLAG) { \
  + unsigned ui = (unsigned)(_psm)->flags; ui |= (RPMPSM_FLAGS_##_FLAG); \
  + (_psm)->flags = (rpmpsmFlags) ui; \
  + }
  +#define F_CLR(_psm, _FLAG) { \
  + unsigned ui = (unsigned)(_psm)->flags; ui &= ~(RPMPSM_FLAGS_##_FLAG); \
  + (_psm)->flags = (rpmpsmFlags) ui; \
  + }
   
   #define  _RPMEVR_INTERNAL
   #include "rpmds.h"
  @@ -1770,10 +1774,11 @@
   #ifdef   REFERENCE
   psm->unorderedSuccessor = async;
   #else
  -if (async)
  +if (async) {
F_SET(psm, UNORDERED);
  -else
  +} else {
F_CLR(psm, UNORDERED);
  +}
   #endif
   }
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2013-06-28 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:   28-Jun-2013 18:25:47
  Branch: rpm-5_4  Handle: 2013062816254700

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

  Log:
- coverity #1035878

  Summary:
RevisionChanges Path
2.399.2.9   +4  -1  rpm/lib/psm.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.399.2.8 -r2.399.2.9 psm.c
  --- rpm/lib/psm.c 26 Jun 2013 17:36:10 -  2.399.2.8
  +++ rpm/lib/psm.c 28 Jun 2013 16:25:47 -  2.399.2.9
  @@ -2503,19 +2503,22 @@
/* Write the lead section into the package. */
{   static const char item[] = "Lead";
const char * NEVR = rpmteNEVR(psm->te);
  + const char * msg = xstrdup(NEVR); /* XXX passed to wrLead() */
size_t nb = rpmpkgSizeof(item, NULL);

if (nb == 0)
rc = RPMRC_FAIL;
else {
void * l = memset(alloca(nb), 0, nb);
  - rc = rpmpkgWrite(item, psm->fd, l, &NEVR);
  + rc = rpmpkgWrite(item, psm->fd, l, &msg);
}
if (rc != RPMRC_OK) {
rpmlog(RPMLOG_ERR, _("Unable to write package: %s\n"),
Fstrerror(psm->fd));
  + msg = _free(msg);
break;
}
  + msg = _free(msg);
}
   
/* Write the signature section into the package. */
  @@ .
__
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/ 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

2011-05-25 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   25-May-2011 14:51:30
  Branch: rpm-5_4  Handle: 2011052512513000

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

  Log:
bring back syslog patch forgotten on rpm-5_2 branch (mdvbz#63318)

  Summary:
RevisionChanges Path
2.399.2.2   +22 -0  rpm/lib/psm.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.399.2.1 -r2.399.2.2 psm.c
  --- rpm/lib/psm.c 29 Dec 2010 15:02:49 -  2.399.2.1
  +++ rpm/lib/psm.c 25 May 2011 12:51:30 -  2.399.2.2
  @@ -3062,6 +3062,17 @@
else
rc = rpmdbAdd(rpmtsGetRdb(ts), tid, fi->h, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBADD), 0);
  +#if defined(HAVE_SYSLOG_H) && defined(RPM_VENDOR_MANDRIVA) /* 
log-install-remove-to-syslog */
  + {
  + char *s, fmt;
  + fmt = rpmExpand("%{___NVRA}", NULL);
  + s = headerSprintf(fi->h, fmt,
  + rpmTagTable, rpmHeaderFormats, NULL);
  + syslog(LOG_NOTICE, "[RPM] %s installed\n", s);
  + fmt = _free(fmt);
  + s = _free(s);
  + }
  +#endif
}
   
if (rc != RPMRC_OK) {
  @@ -3091,6 +3102,17 @@
(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi->record, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
  +#if defined(HAVE_SYSLOG_H) && defined(RPM_VENDOR_MANDRIVA) /* 
log-install-remove-to-syslog */
  +{
  + char *s, fmt;
  + fmt = rpmExpand("%{___NVRA}", NULL);
  + s = headerSprintf(fi->h, fmt,
  + rpmTagTable, rpmHeaderFormats, NULL);
  + syslog(LOG_NOTICE, "[RPM] %s removed\n", s);
  + fmt = _free(fmt);
  + s = _free(s);
  + }
  +#endif
   
if (rc != RPMRC_OK) {
xx = rpmtxnAbort(rpmtsGetRdb(ts)->db_txn);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org