Merged crash fix from trunk.


git-svn-id: https://svn.osgeo.org/gdal/branches/1.11@27211 f0d54148-0727-0410-94bb-9a71ac55c965