Changeset 14736

Timestamp:

06/20/08 17:14:33 (5 months ago)

Author:

rouault

Message:

Fix crash in GDALCreateGeoLocTransformer if X_DATASET, etc... cannot be opened (#2434)

Files:

• branches/1.5/gdal/alg/gdalgeoloc.cpp (modified) (2 diffs)

branches/1.5/gdal/alg/gdalgeoloc.cpp

@@ -659 +659 @@
-    }
-
+    if (psTransform->hDS_X == NULL ||
+        psTransform->hDS_Y == NULL)
+    {
+        GDALDestroyGeoLocTransformer( psTransform );
+        return NULL;
+    }
+
-/* -------------------------------------------------------------------- */
-/*      Get the band handles.                                           */
@@ -669 +676 @@
-    nBand = MAX(1,atoi(CSLFetchNameValue( papszGeolocationInfo, "Y_BAND" )));
-    psTransform->hBand_Y = GDALGetRasterBand( psTransform->hDS_Y, nBand );
+
+    if (psTransform->hBand_X == NULL ||
+        psTransform->hBand_Y == NULL)
+    {
+        GDALDestroyGeoLocTransformer( psTransform );
+        return NULL;
+    }
-
-/* -------------------------------------------------------------------- */