summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 15:56:29 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 15:56:29 +0100
commit25ee65dd5155fda6dd3754d091b86acb5d7bd9dc (patch)
tree628998d41f603b2e39a5a541f24231312424468f
parentc1f168f54be5b4babeb9b91cd7145441ea2489ad (diff)
* apt-pkg/cdrom.cc:
- fix crash in pkgUdevCdromDevices
-rw-r--r--apt-pkg/cdrom.cc3
-rw-r--r--debian/changelog2
2 files changed, 4 insertions, 1 deletions
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