* apt-pkg/cdrom.cc:

  - fix crash in pkgUdevCdromDevices

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 72d8e4d4174af464d9c9c8ddc6f9361f20eb0441..3467f49d78716895bfd595672d7c4e642eddcf24 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -921,6 +921,7 @@ pkgUdevCdromDevices::Scan()                                             /*{{{*/
 
 pkgUdevCdromDevices::~pkgUdevCdromDevices()                             /*{{{*/
 { 
 
 pkgUdevCdromDevices::~pkgUdevCdromDevices()                             /*{{{*/
 { 

-   dlclose(libudev_handle);
+   if (libudev_handle != NULL)
+      dlclose(libudev_handle);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

diff --git a/debian/changelog b/debian/changelog
index 7e38cda9985964fddf1c77399ff743fdcde92009..baf541e149a000f60a41c7e62c79d7cb368164e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ apt (0.7.25.1) UNRELEASED; urgency=low
   * apt-pkg/contrib/cdromutl.cc:
     - fix UnmountCdrom() fails, give it a bit more time and try
       the umount again
   * apt-pkg/contrib/cdromutl.cc:
     - fix UnmountCdrom() fails, give it a bit more time and try
       the umount again

+  * apt-pkg/cdrom.cc:
+    - fix crash in pkgUdevCdromDevices

   * methods/cdrom.cc:
     - fixes in multi cdrom setup code
     - add new "Acquire::cdrom::AutoDetect" variable that enables/disables
   * methods/cdrom.cc:
     - fixes in multi cdrom setup code
     - add new "Acquire::cdrom::AutoDetect" variable that enables/disables