Author: dmacvicar Date: Wed Apr 2 22:55:16 2008 New Revision: 9345 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9345&view=rev Log: don't crash with incompatible products (bnc #292658) version 2.31.1 Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/parser/yum/YUMProductParser.cc branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/source/yum/YUMSourceImpl.cc Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION?rev=9345&r1=9344&r2=9345&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION Wed Apr 2 22:55:16 2008 @@ -49,5 +49,5 @@ m4_define([LIBZYPP_MINOR], [31]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [0]) +m4_define([LIBZYPP_PATCH], [1]) dnl ================================================== Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes?rev=9345&r1=9344&r2=9345&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes Wed Apr 2 22:55:16 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 2 22:53:39 CEST 2008 - dmacvicar@suse.de + +- don't crash with incompatible products (bnc #292658) +- version 2.31.1 + +------------------------------------------------------------------- Wed Apr 2 15:45:48 CEST 2008 - dmacvicar@suse.de - Exclude delta and patch rpms from plaindir Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/parser/yum/YUMProductParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/parser/yum/YUMProductParser.cc?rev=9345&r1=9344&r2=9345&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/parser/yum/YUMProductParser.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/parser/yum/YUMProductParser.cc Wed Apr 2 22:55:16 2008 @@ -90,6 +90,7 @@ if (!Arch(productPtr->arch).compatibleWith( _zypp_architecture )) { productPtr = NULL; // skip <package>, incompatible architecture + ERR << "Skipping incompatible architecture product. " << endl; break; } } Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/source/yum/YUMSourceImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/source/yum/YUMSourceImpl.cc?rev=9345&r1=9344&r2=9345&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/source/yum/YUMSourceImpl.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/source/yum/YUMSourceImpl.cc Wed Apr 2 22:55:16 2008 @@ -466,6 +466,12 @@ YUMProductParser product(st, "", progress); for (; !product.atEnd(); ++product) { + if ( ! *product ) + { + ERR << "skipping invalid product from " << filename << endl; + continue; + } + Product::Ptr p = createProduct( source_r, **product ); store.insert (p); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org