Fix very silly segfault.

diff --git a/ChangeLog b/ChangeLog
index 41d3a580e7e541bbe090cbfeffd9c62c4b9ff39c..cae048ae2d013d4ff4d4b8d5139d5a1c62486282 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 6 23:50:17 BST 2004 Daniel Kobras <kobras@debian.org>
+
+  * main/enquiry.c: Remove dereference of unitialised and unused pointer
+  variable, fixing segfault on when "gcc -dumpmachine" returns a
+  non-matching triplet.
+
 Thu May 6 23:44:55 BST 2004 Colin Watson <cjwatson@debian.org>
 
   * dselect/helpmsgs.cc: Pressing 'n' repeats the last search, not

diff --git a/debian/changelog b/debian/changelog
index e6d1821a060070e7fe78f61e7da6b47a6e93979e..6e16abcbd76832e856e1e5d9603f2ca8ae7be161 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dpkg (1.10.22) unstable; urgency=low
     properly again.  Closes: #246595.
   * Make dpkg-scanpackages output Origin and Bugs fields with proper
     casing.  Closes: #154422.
+  * Fix segfault when "gcc -dumpmachine" returns a non-matching triplet.
+    Closes: #211850.
   * Correct 'n' and 'p' key descriptions in dselect help message.
     Closes: #120562.
   * Stop hardcoding the list of manual page languages in debian/rules,

diff --git a/main/enquiry.c b/main/enquiry.c
index a8a8b762136c6696b52922395120dfb2aba3b081..c6aa18727c6dfcf334b729cb092588df13a99deb 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -402,7 +402,7 @@ void printarch(const char *const *argv) {
   FILE *ccpipe;
   struct varbuf vb;
   ptrdiff_t ll;
-  char *p, *q;
+  char *p;
 
   if (*argv) badusage(_("--print-architecture does not take any argument"));
 
@@ -445,7 +445,7 @@ void printarch(const char *const *argv) {
   default: internerr("unknown action in printarch");
   }
   if (!arch) {
-    *q= 0; arch= p;
+    arch= p;
     fprintf(stderr, _("dpkg: warning, architecture `%s' not in remapping table\n"),arch);
   }
   if (printf("%s\n",arch) == EOF) werr("stdout");