From 75fd44db027daeb2fba632e7da33d17294991e78 Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Mon, 28 Mar 2011 18:06:43 +0000 Subject: 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 --- ChangeLog | 5 +++++ src/pj_gridlist.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f21dfe68..cb01ec70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-03-28 Frank Warmerdam + + * src/pj_gridlist.c: avoid possible buffer overflow. + https://bugs.meego.com/show_bug.cgi?id=14963 + 2011-03-23 Frank Warmerdam * 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(); -- cgit v1.2.3