Imported Upstream version 14.45.12

diff --git a/VERSION.cmake b/VERSION.cmake
index 4deb5a0c7d46f59c7ef5438fd3dee4e32ff74cc2..c104e9cd2f8203bf245805f1f11c442e5daf24e5 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "39")
 SET(LIBZYPP_MINOR "45")
-SET(LIBZYPP_PATCH "11")
+SET(LIBZYPP_PATCH "12")
 #
-# LAST RELEASED: 14.45.11 (39)
+# LAST RELEASED: 14.45.12 (39)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index d051243b2dee86bc712b4cfc10a34ea4bc6d1b75..d5e23e280509bf62ca281be561adbd2891bd70fe 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  9 15:51:25 CEST 2018 - ma@suse.de
+
+- HardLocksFile: Prevent against empty commit without Target having
+- version 14.45.12 (39)
+
 -------------------------------------------------------------------
 Wed Apr 25 15:16:30 CEST 2018 - ma@suse.de
 

diff --git a/zypp/base/LogControl.cc b/zypp/base/LogControl.cc
index 03080bb17ae058f582b84574aedc7573a86db054..bacbc30025c10a50050e73dd096ce811bcaa9b3d 100644 (file)
--- a/zypp/base/LogControl.cc
+++ b/zypp/base/LogControl.cc
@@ -282,7 +282,13 @@ namespace zypp
             {
               _streamtable[group_r][level_r].reset( new Loglinestream( group_r, level_r ) );
             }
-          return _streamtable[group_r][level_r]->getStream( file_r, func_r, line_r );
+          std::ostream & ret( _streamtable[group_r][level_r]->getStream( file_r, func_r, line_r ) );
+         if ( !ret )
+         {
+           ret.clear();
+           ret << "---<RESET LOGSTREAM FROM FAILED STATE]" << endl;
+         }
+          return ret;
         }
 
         /** Format and write out a logline from Loglinebuf. */

diff --git a/zypp/target/HardLocksFile.h b/zypp/target/HardLocksFile.h
index 70f9e9e923d503fd936ff6dbc43f5a5ede962c27..e90e4ac192de230a62158c4f14c352b2c3af09cd 100644 (file)
--- a/zypp/target/HardLocksFile.h
+++ b/zypp/target/HardLocksFile.h
@@ -73,7 +73,11 @@ namespace zypp
         void setData( const Data & data_r )
         {
           if ( !_dataPtr )
+         {
+           if ( data_r.empty() )
+             return;   // bsc#1096803: Prevent against empty commit without Target having been been loaded (!_dataPtr )
             _dataPtr.reset( new Data );
+         }
 
           if ( differs( *_dataPtr, data_r ) )
           {