From 04d1dc5111b134e8618dd306149dc7a768838c77 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sat, 29 Aug 2015 16:30:03 -0700 Subject: Ensure strncpy'd strings are null terminated (bzr r14332) --- src/io/streamtest.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/io') diff --git a/src/io/streamtest.cpp b/src/io/streamtest.cpp index 2030e6a85..ec59ac4a6 100644 --- a/src/io/streamtest.cpp +++ b/src/io/streamtest.cpp @@ -202,6 +202,7 @@ void path_init(char *path, char *name) exit(1); } strncpy(ptr+1,name,strlen(name)+1); + path[PATH_MAX-1] = '\0'; printf("'%s'\n",path); } -- cgit v1.2.3 From 4aca329e373b27be4f8171e9f6cf2c8e04d591bc Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Mon, 22 Feb 2016 21:16:54 +0100 Subject: static code analysis (bzr r14665) --- src/io/inkjar.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/io') diff --git a/src/io/inkjar.cpp b/src/io/inkjar.cpp index fb1fedf55..345455c4a 100644 --- a/src/io/inkjar.cpp +++ b/src/io/inkjar.cpp @@ -103,14 +103,19 @@ bool JarFile::init_inflation() bool JarFile::open() { + if (_file != NULL) { + fclose(_file); + } if ((_file = fopen(_filename, "r")) == NULL) { - fprintf(stderr, "open failed.\n"); - return false; + fprintf(stderr, "open failed.\n"); + return false; + } + if (!init_inflation()) { + return false; + } + else { + return true; } - if (!init_inflation()) - return false; - - return true; } bool JarFile::close() -- cgit v1.2.3