From: Michael Andres <ma@suse.de>
Date: Wed, 6 Aug 2008 14:24:46 +0000 (+0000)
Subject: Dont let exception escape MediaSetAccess dtor (bnc #415017)
X-Git-Tag: BASE-SuSE-Code-11-Branch~534
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d16412a0e48a1a60a7ea767b60849d568b4882da;p=platform%2Fupstream%2Flibzypp.git

Dont let exception escape MediaSetAccess dtor (bnc #415017)
---

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 66b4623..b66aeb6 100644
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Aug  6 16:23:27 CEST 2008 ma@suse.de
+
+- Don't let exception escape MediaSetAccess dtor (bnc #415017)
+- revision 10763
+
+-------------------------------------------------------------------
 Mon Aug  4 19:34:27 CEST 2008 ma@suse.de
 
 - Add new product attributes (flavor,referencePackage).
diff --git a/zypp/MediaSetAccess.cc b/zypp/MediaSetAccess.cc
index 3cd0745..73472a3 100644
--- a/zypp/MediaSetAccess.cc
+++ b/zypp/MediaSetAccess.cc
@@ -44,7 +44,11 @@ IMPL_PTR_TYPE(MediaSetAccess);
 
   MediaSetAccess::~MediaSetAccess()
   {
-    release();
+    try
+    {
+      release();
+    }
+    catch(...) {} // don't let exception escape a dtor.
   }
 
 
@@ -88,14 +92,14 @@ IMPL_PTR_TYPE(MediaSetAccess);
   {
     media::MediaManager media_mgr;
     media::MediaAccessId media;
-  
+
     media = getMediaAccessId( media_nr);
     DBG << "Going to release file " << file
         << " from media number " << media_nr << endl;
-      
+
     if ( ! media_mgr.isAttached(media) )
       return; //disattached media is free
-      
+
     media_mgr.releaseFile (media, file);
   }