From 162bd7c9d303cf5bc6fb30fa1c19ec8f14f1eb46 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 19 Dec 2011 16:19:07 +0000 Subject: [PATCH] Make sure input is at least 3 characters long (#1146) git-svn-id: http://svn.osgeo.org/postgis/trunk@8471 b70326c6-7e19-0410-871a-916f4a2858ee --- doc/html/image_src/generator.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/html/image_src/generator.c b/doc/html/image_src/generator.c index 3d09403f5..82be408fb 100644 --- a/doc/html/image_src/generator.c +++ b/doc/html/image_src/generator.c @@ -338,12 +338,13 @@ int main( int argc, const char* argv[] ) int layerCount; int styleNumber; LAYERSTYLE *styles; + char *image_path = "../images/"; getStyles(&styles); - if ( argc != 2 ) + if ( argc != 2 || strlen(argv[1]) < 3) { - lwerror("You must specifiy a wkt filename to convert.\n"); + lwerror("You must specify a wkt filename to convert, and it must be 3 or more characters long.\n"); return -1; } @@ -353,8 +354,8 @@ int main( int argc, const char* argv[] ) return -1; } - filename = malloc( strlen(argv[1])+11 ); - strcpy( filename, "../images/" ); + filename = malloc( strlen(argv[1]) + strlen(image_path) + 1 ); + strcpy( filename, image_path ); strncat( filename, argv[1], strlen(argv[1])-3 ); strncat( filename, "png", 3 ); -- 2.50.1