aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2011-03-28 18:06:43 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2011-03-28 18:06:43 +0000
commit75fd44db027daeb2fba632e7da33d17294991e78 (patch)
tree4d681d45f227f358988fd7596f34ab1d400fe49f
parentba0403ec4ef2a67579c6ccd0b581202dbc1a9f95 (diff)
downloadPROJ-75fd44db027daeb2fba632e7da33d17294991e78.tar.gz
PROJ-75fd44db027daeb2fba632e7da33d17294991e78.zip
avoid possible buffer overflow processing nadgrids directive (meego #14963)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1990 4e78687f-474d-0410-85f9-8d5e500ac6b2
-rw-r--r--ChangeLog5
-rw-r--r--src/pj_gridlist.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f21dfe68..cb01ec70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-28 Frank Warmerdam <warmerdam@pobox.com>
+
+ * src/pj_gridlist.c: avoid possible buffer overflow.
+ https://bugs.meego.com/show_bug.cgi?id=14963
+
2011-03-23 Frank Warmerdam <warmerdam@pobox.com>
* src/pj_initcache.c: Fix reversed memcpy that causes a crash on the
diff --git a/src/pj_gridlist.c b/src/pj_gridlist.c
index 9f48146f..0ed66310 100644
--- a/src/pj_gridlist.c
+++ b/src/pj_gridlist.c
@@ -192,7 +192,7 @@ PJ_GRIDINFO **pj_gridlist_from_nadgrids( projCtx ctx, const char *nadgrids,
s[end_char] != '\0' && s[end_char] != ',';
end_char++ ) {}
- if( end_char > sizeof(name) )
+ if( end_char >= sizeof(name) )
{
pj_ctx_set_errno( ctx, -38 );
pj_release_lock();