From 366e520f969b2e7dd27d6c4051a9ae652b6b3ea3 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Nov 2016 10:33:19 +0900 Subject: [PATCH] Imported Upstream version 14.38.3 Change-Id: I1e6849f0e2a858cc4028f96d5f531840b74358e4 Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ zypp/target/rpm/RpmHeader.cc | 12 +++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index c392fef..46c9884 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "14") SET(LIBZYPP_COMPATMINOR "30") SET(LIBZYPP_MINOR "38") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_PATCH "3") # -# LAST RELEASED: 14.38.2 (30) +# LAST RELEASED: 14.38.3 (30) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 73f57e4..db69894 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 5 14:33:23 CEST 2015 - ma@suse.de + +- Fix SEGV when dumping rpm header with epoch (bnc#929483) +- version 14.38.3 (30) + +------------------------------------------------------------------- Thu Apr 2 19:21:07 CEST 2015 - ma@suse.de - POODLE: libzypp should only talk TLS (bnc#903405) diff --git a/zypp/target/rpm/RpmHeader.cc b/zypp/target/rpm/RpmHeader.cc index e4327e5..0dffec5 100644 --- a/zypp/target/rpm/RpmHeader.cc +++ b/zypp/target/rpm/RpmHeader.cc @@ -266,11 +266,13 @@ RpmHeader::constPtr RpmHeader::readPackage( const Pathname & path_r, // std::ostream & RpmHeader::dumpOn( std::ostream & str ) const { - return BinHeader::dumpOn( str ) << '{' << tag_name() << "-" - << (tag_epoch()==0?"":(tag_epoch()+":")) - << tag_version() - << (tag_release().empty()?"":(std::string("-")+tag_release())) - << ( isSrc() ? ".src}" : "}"); + str << BinHeader::dumpOn( str ) << '{' << tag_name() << "-"; + if ( tag_epoch() != 0 ) + str << tag_epoch() << ":"; + str << tag_version() + << (tag_release().empty()?"":(std::string("-")+tag_release())) + << ( isSrc() ? ".src}" : "}"); + return str; } -- 2.7.4