Changeset 11399

Timestamp:

May 2, 2007, 1:10:00 PM (17 years ago)

Author:

warmerdam

Message:

Check for NULL pszColor in OGRStyleTool::GetRGBFromString() (#1571)

File:

• branches/1.4/gdal/ogr/ogrfeaturestyle.cpp (modified) (1 diff)

branches/1.4/gdal/ogr/ogrfeaturestyle.cpp

@@ -849 +849 @@
                                      int &nTransparance)
 {
-   int nCount;
+   int nCount = 0;
    
    nTransparance = 255;
 
    // FIXME: should we really use sscanf here?
-   nCount  = sscanf(pszColor,"#%2x%2x%2x%2x",&nRed,&nGreen,&nBlue, 
-                    &nTransparance);
+   if( pszColor )
+       nCount  = sscanf(pszColor,"#%2x%2x%2x%2x",&nRed,&nGreen,&nBlue, 
+                        &nTransparance);
    
    if (nCount >=3)