From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 26 Jan 2010 14:56:29 +0000 (+0100)
Subject: * apt-pkg/cdrom.cc:
X-Git-Tag: 0.7.25.3ubuntu1~6^2~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/25ee65dd5155fda6dd3754d091b86acb5d7bd9dc

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

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 72d8e4d41..3467f49d7 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -921,6 +921,7 @@ pkgUdevCdromDevices::Scan()                                             /*{{{*/
 
 pkgUdevCdromDevices::~pkgUdevCdromDevices()                             /*{{{*/
 { 
-   dlclose(libudev_handle);
+   if (libudev_handle != NULL)
+      dlclose(libudev_handle);
 }
 									/*}}}*/
diff --git a/debian/changelog b/debian/changelog
index 7e38cda99..baf541e14 100644
--- 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/cdrom.cc:
+    - fix crash in pkgUdevCdromDevices
   * methods/cdrom.cc:
     - fixes in multi cdrom setup code
     - add new "Acquire::cdrom::AutoDetect" variable that enables/disables