Explorar el Código

* apt-pkg/deb/dpkgpm.cc:
- do not crash if (*I).Pkg is NULL (LP: #939867)

Michael Vogt hace 14 años
padre
commit
671b711637
Se han modificado 2 ficheros con 10 adiciones y 2 borrados
  1. 4 1
      apt-pkg/deb/dpkgpm.cc
  2. 6 1
      debian/changelog

+ 4 - 1
apt-pkg/deb/dpkgpm.cc

@@ -1595,7 +1595,10 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
    const char *ops_str[] = {"Install", "Configure","Remove","Purge"};
    fprintf(report, "AptOrdering:\n");
    for (vector<Item>::iterator I = List.begin(); I != List.end(); ++I)
-      fprintf(report, " %s: %s\n", (*I).Pkg.Name(), ops_str[(*I).Op]);
+      if ((*I).Pkg != NULL)
+         fprintf(report, " %s: %s\n", (*I).Pkg.Name(), ops_str[(*I).Op]);
+      else
+         fprintf(report, " %s: %s\n", "NULL", ops_str[(*I).Op]);
 
    // attach dmesg log (to learn about segfaults)
    if (FileExists("/bin/dmesg"))

+ 6 - 1
debian/changelog

@@ -12,7 +12,12 @@ apt (0.8.16~exp14) UNRELEASED; urgency=low
     - recheck all dependencies if we changed a package in SmartConfigure
       as this could break an earlier dependency (LP: #940396)
     - recheck dependencies in SmartUnpack after a change, too
-
+  
+  [ Thorsten Spindler ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - do not crash if (*I).Pkg is NULL (LP: #939867)
+  
+  
  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 13 Mar 2012 12:38:35 +0100
 
 apt (0.8.16~exp13) experimental; urgency=low