Allow spaces between the end of a version, and the trailing ')'.

diff --git a/ChangeLog b/ChangeLog
index 54cee77f624fd9eb828f377a745482c9cdca1a1c..420f0e53e703544861028698a04226aadbb5d226 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 24 14:41:45 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * lib/fields.c: Allow spaces between the end of a version, and the
+    trailing ')'.
+
 Sat Aug 24 14:16:13 CDT 2002 Adam Heath <doogie@debian.org>
 
   * lib/archives.c: Fix segfault when --auto-deconfigure is given.  This is

diff --git a/debian/changelog b/debian/changelog
index a336393494b58209e08322bf9fefd554d4715fe6..f6adda4ed938ff4dfb0790820f73ce5717f40b40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ dpkg (1.10.5) unstable; urgency=low
   * Fix read past buffer in lib/nfmalloc.c.  Closes: #157304.
   * Fix several read pass buffer bugs, and a memleak.  Closes: #155362.
   * Fix segfault when --auto-deconfigure is given.  Closes: #157762.
+  * Allow spaces between the end of a version, and the trailing ')'.
+    Closes: #154898.
 
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 

diff --git a/lib/fields.c b/lib/fields.c
index 60141068a095665810b39ae8bf078bec37b9433e..f192cedbce56d3796c2b403a268298610e5184c9 100644 (file)
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -375,6 +375,7 @@ void f_dependency(struct pkginfo *pigp, struct pkginfoperfile *pifp,
           if (isspace(*p)) break;
           p++;
         }
+       versionlength= p - versionstart;
         while (isspace(*p)) p++;
         if (*p == '(') parseerr(NULL,filename,lno, warnto,warncount,pigp,0,
                                 _("`%s' field, reference to `%.255s': "
@@ -385,7 +386,6 @@ void f_dependency(struct pkginfo *pigp, struct pkginfoperfile *pifp,
         else if (*p == 0) parseerr(NULL,filename,lno, warnto,warncount,pigp,0,
                                    _("`%s' field, reference to `%.255s': "
                                    "version unterminated"),fip->name,depname);
-       versionlength= p - versionstart;
        if (versionlength >=  versionused) {
          versionused= versionlength;
          version= realloc(version,versionlength+1);