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: 05-Sep-2014 18:04:53
Branch: rpm-5_4 Handle: 2014090516045101
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/lib rpmds.c
Log:
- rpmds: fix: off-by-1 comparison check parsing N.A compound.
Summary:
Revision Changes Path
1.3501.2.435+1 -0 rpm/CHANGES
2.170.2.25 +2 -2 rpm/lib/rpmds.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.434 -r1.3501.2.435 CHANGES
--- rpm/CHANGES 4 Sep 2014 13:38:08 -0000 1.3501.2.434
+++ rpm/CHANGES 5 Sep 2014 16:04:51 -0000 1.3501.2.435
@@ -1,4 +1,5 @@
5.4.15 -> 5.4.16:
+ - jbj: rpmds: fix: off-by-1 comparison check parsing N.A compound.
- jbj: lua: fix: resurrect output capture with lua-5.2.
- jbj: python: add transaction.py wrapper class onto _rpmts.
- jbj: python: add specPkgObject, blueprint build methods.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.170.2.24 -r2.170.2.25 rpmds.c
--- rpm/lib/rpmds.c 28 Aug 2014 13:05:18 -0000 2.170.2.24
+++ rpm/lib/rpmds.c 5 Sep 2014 16:04:52 -0000 2.170.2.25
@@ -3991,11 +3991,11 @@
if (!AA && !BA) {
rc = strcmp(AN, BN);
} else if (AA && !BA) {
- rc = strncmp(AN, BN, (AA - AN)) || BN[AA - AN];
+ rc = strncmp(AN, BN, (AA - AN)) || BN[AA - AN - 1];
if (!rc)
rc = strcmp(AA, B->A);
} else if (!AA && BA) {
- rc = strncmp(AN, BN, (BA - BN)) || AN[BA - BN];
+ rc = strncmp(AN, BN, (BA - BN)) || AN[BA - BN - 1];
if (!rc)
rc = strcmp(BA, A->A);
} else {
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
