diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2001-03-15 16:57:55 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2001-03-15 16:57:55 +0000 |
| commit | 9e2d42afa23c76e03e478cc62c76a7ccd3290948 (patch) | |
| tree | e40387f917f78a462e2b136f438d3beeddbf57c1 | |
| parent | e8fee3df62f4574611fc1d07f910cc5b8e4847d7 (diff) | |
| download | PROJ-9e2d42afa23c76e03e478cc62c76a7ccd3290948.tar.gz PROJ-9e2d42afa23c76e03e478cc62c76a7ccd3290948.zip | |
fixed intermittent problem in pj_load_nadgrids()
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@912 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/pj_apply_gridshift.c | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2001-03-15 Frank Warmerdam <warmerdam@pobox.com> + + * src/pj_apply_gridshift.c: fixed bug in pj_load_nadgrids() which + would sometimes result in the load function failing because of a + buffer overrun in the grid list string. + 2001-03-14 Frank Warmerdam <warmerdam@pobox.com> * added nad/epsg database of translations between EPSG PCS/GCS diff --git a/src/pj_apply_gridshift.c b/src/pj_apply_gridshift.c index 0f7e39a6..5a9232b7 100644 --- a/src/pj_apply_gridshift.c +++ b/src/pj_apply_gridshift.c @@ -31,6 +31,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.2 2001/03/15 16:57:55 warmerda + * fixed intermittent problem in pj_load_nadgrids() + * * Revision 1.1 2000/07/06 23:32:27 warmerda * New * @@ -187,7 +190,7 @@ static struct CTABLE **pj_load_nadgrids( const char *nadgrids ) /* -------------------------------------------------------------------- */ /* Loop processing names out of nadgrids one at a time. */ /* -------------------------------------------------------------------- */ - for( s = nadgrids; *s != '\0'; s++ ) + for( s = nadgrids; *s != '\0'; ) { int end_char; char name[128]; @@ -209,6 +212,7 @@ static struct CTABLE **pj_load_nadgrids( const char *nadgrids ) if( *s == ',' ) s++; + last_nadgrids_list[nadgrids_count] = pj_get_grid( name ); if( last_nadgrids_list[nadgrids_count] == NULL ) return NULL; |