[zypp-commit] r9508 - /trunk/libzypp/zypp/sat/LookupAttr.cc

10 Apr 2008

Author: mlandres
Date: Thu Apr 10 14:28:39 2008
New Revision: 9508

URL: http://svn.opensuse.org/viewcvs/zypp?rev=9508&view=rev
Log:
Protect LookupAttr::iterator against post end access.

Modified:
    trunk/libzypp/zypp/sat/LookupAttr.cc

Modified: trunk/libzypp/zypp/sat/LookupAttr.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/LookupAttr.cc?rev=9508&r1=9507&r2=9508&view=diff
==============================================================================

--- trunk/libzypp/zypp/sat/LookupAttr.cc (original)
+++ trunk/libzypp/zypp/sat/LookupAttr.cc Thu Apr 10 14:28:39 2008
@@ -104,29 +104,29 @@
     ///////////////////////////////////////////////////////////////////
 
     Repository LookupAttr::iterator::inRepo() const
-    { return Repository( _dip->repo ); }
+    { return _dip ? Repository( _dip->repo ) : Repository::noRepository; }
 
     Solvable LookupAttr::iterator::inSolvable() const
-    { return Solvable( _dip->solvid ); }
+    { return _dip ? Solvable( _dip->solvid ) : Solvable::noSolvable; }
 
     SolvAttr LookupAttr::iterator::inSolvAttr() const
-    { return SolvAttr( _dip->key->name ); }
+    { return _dip ? SolvAttr( _dip->key->name ) : SolvAttr::noAttr; }
 
     void LookupAttr::iterator::nextSkipSolvAttr()
-    { ::dataiterator_skip_attribute( _dip.get() ); }
+    { if ( _dip ) ::dataiterator_skip_attribute( _dip.get() ); }
 
     void LookupAttr::iterator::nextSkipSolvable()
-    { ::dataiterator_skip_solvable( _dip.get() ); }
+    { if ( _dip ) ::dataiterator_skip_solvable( _dip.get() ); }
 
     void LookupAttr::iterator::nextSkipRepo()
-    { ::dataiterator_skip_repo( _dip.get() ); }
+    { if ( _dip ) ::dataiterator_skip_repo( _dip.get() ); }
 
     ///////////////////////////////////////////////////////////////////
     // attr value type test
     ///////////////////////////////////////////////////////////////////
 
     detail::IdType LookupAttr::iterator::solvAttrType() const
-    { return _dip->key->type; }
+    { return _dip ? _dip->key->type : detail::noId; }
 
     bool LookupAttr::iterator::solvAttrNumeric() const
     {
@@ -183,18 +183,21 @@
     }
 
     ///////////////////////////////////////////////////////////////////
-    // attr value type test
+    // attr value retrieval
     ///////////////////////////////////////////////////////////////////
 
     int LookupAttr::iterator::asInt() const
     {
-      switch ( solvAttrType() )
+      if ( _dip )
       {
-        case REPOKEY_TYPE_U32:
-        case REPOKEY_TYPE_NUM:
-        case REPOKEY_TYPE_CONSTANT:
-          return _dip->kv.num;
-          break;
+        switch ( solvAttrType() )
+        {
+          case REPOKEY_TYPE_U32:
+          case REPOKEY_TYPE_NUM:
+          case REPOKEY_TYPE_CONSTANT:
+            return _dip->kv.num;
+            break;
+        }
       }
       return 0;
     }
@@ -208,91 +211,103 @@
 
     const char * LookupAttr::iterator::c_str() const
     {
-      switch ( solvAttrType() )
+      if ( _dip )
       {
-        case REPOKEY_TYPE_ID:
-        case REPOKEY_TYPE_IDARRAY:
-        case REPOKEY_TYPE_CONSTANTID:
-          if ( _dip->data && _dip->data->localpool )
-            return ::stringpool_id2str( &_dip->data->spool, _dip->kv.id ); // in local pool
-          else
-            return IdString( _dip->kv.id ).c_str(); // in global pool
-          break;
-
-        case REPOKEY_TYPE_STR:
-          return _dip->kv.str;
-          break;
-
-        case REPOKEY_TYPE_DIRSTRARRAY:
-          return ::repodata_dir2str( _dip->data, _dip->kv.id, _dip->kv.str );
-          break;
+        switch ( solvAttrType() )
+        {
+          case REPOKEY_TYPE_ID:
+          case REPOKEY_TYPE_IDARRAY:
+          case REPOKEY_TYPE_CONSTANTID:
+            if ( _dip->data && _dip->data->localpool )
+              return ::stringpool_id2str( &_dip->data->spool, _dip->kv.id ); // in local pool
+            else
+              return IdString( _dip->kv.id ).c_str(); // in global pool
+            break;
+
+          case REPOKEY_TYPE_STR:
+            return _dip->kv.str;
+            break;
+
+          case REPOKEY_TYPE_DIRSTRARRAY:
+            return ::repodata_dir2str( _dip->data, _dip->kv.id, _dip->kv.str );
+            break;
+        }
       }
       return 0;
     }
 
     std::string LookupAttr::iterator::asString() const
     {
-      switch ( solvAttrType() )
+      if ( _dip )
       {
-        case REPOKEY_TYPE_ID:
-        case REPOKEY_TYPE_IDARRAY:
-        case REPOKEY_TYPE_CONSTANTID:
-        case REPOKEY_TYPE_STR:
-        case REPOKEY_TYPE_DIRSTRARRAY:
+        switch ( solvAttrType() )
+        {
+          case REPOKEY_TYPE_ID:
+          case REPOKEY_TYPE_IDARRAY:
+          case REPOKEY_TYPE_CONSTANTID:
+          case REPOKEY_TYPE_STR:
+          case REPOKEY_TYPE_DIRSTRARRAY:
           {
             const char * ret( c_str() );
             return ret ? ret : "";
           }
           break;
 
-        case REPOKEY_TYPE_U32:
-        case REPOKEY_TYPE_NUM:
-        case REPOKEY_TYPE_CONSTANT:
-          return str::numstring( asInt() );
-          break;
-
-        case REPOKEY_TYPE_MD5:
-        case REPOKEY_TYPE_SHA1:
-        case REPOKEY_TYPE_SHA256:
+          case REPOKEY_TYPE_U32:
+          case REPOKEY_TYPE_NUM:
+          case REPOKEY_TYPE_CONSTANT:
+            return str::numstring( asInt() );
+            break;
+
+          case REPOKEY_TYPE_MD5:
+          case REPOKEY_TYPE_SHA1:
+          case REPOKEY_TYPE_SHA256:
           {
             std::ostringstream str;
             str << asCheckSum();
             return str.str();
           }
           break;
+        }
       }
-     return std::string();
+      return std::string();
     }
 
     IdString LookupAttr::iterator::idStr() const
     {
-      switch ( solvAttrType() )
+      if ( _dip )
       {
-        case REPOKEY_TYPE_ID:
-        case REPOKEY_TYPE_IDARRAY:
-        case REPOKEY_TYPE_CONSTANTID:
-          return IdString( ::repodata_globalize_id( _dip->data, _dip->kv.id ) );
-          break;
+        switch ( solvAttrType() )
+        {
+          case REPOKEY_TYPE_ID:
+          case REPOKEY_TYPE_IDARRAY:
+          case REPOKEY_TYPE_CONSTANTID:
+            return IdString( ::repodata_globalize_id( _dip->data, _dip->kv.id ) );
+            break;
+        }
       }
       return IdString();
     }
 
     CheckSum LookupAttr::iterator::asCheckSum() const
     {
-      switch ( solvAttrType() )
+      if ( _dip )
       {
-        case REPOKEY_TYPE_MD5:
-          return CheckSum::md5( ::repodata_chk2str( _dip->data, solvAttrType(), (unsigned char *)_dip->kv.str ) );
-          break;
-
-        case REPOKEY_TYPE_SHA1:
-          return CheckSum::sha1( ::repodata_chk2str( _dip->data, solvAttrType(), (unsigned char *)_dip->kv.str ) );
-          break;
+        switch ( solvAttrType() )
+        {
+          case REPOKEY_TYPE_MD5:
+            return CheckSum::md5( ::repodata_chk2str( _dip->data, solvAttrType(), (unsigned char *)_dip->kv.str ) );
+            break;
+
+          case REPOKEY_TYPE_SHA1:
+            return CheckSum::sha1( ::repodata_chk2str( _dip->data, solvAttrType(), (unsigned char *)_dip->kv.str ) );
+            break;
+
+          case REPOKEY_TYPE_SHA256:
+            return CheckSum::sha256( ::repodata_chk2str( _dip->data, solvAttrType(), (unsigned char *)_dip->kv.str ) );
+            break;
+        }
 
-        case REPOKEY_TYPE_SHA256:
-          return CheckSum::sha256( ::repodata_chk2str( _dip->data, solvAttrType(), (unsigned char *)_dip->kv.str ) );
-          break;
-      }
       return CheckSum();
     }
 

-- 
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org

    

[zypp-commit] r9508 - /trunk/libzypp/zypp/sat/LookupAttr.cc

mlandres＠svn.opensuse.org