JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Fixed use of strncpy in xstrcpy()

Browse Source
This commit is contained in:
Lew Rossman
2019-09-30 15:51:17 -04:00
parent 3300ef00cb
commit 38278f7d46
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/project.c
View File

@@ -18,6 +18,8 @@
//*** For the Windows SDK _tempnam function ***// //*** For the Windows SDK _tempnam function ***//
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
//#else
//#include <unistd.h >
#endif #endif
#include "types.h" #include "types.h"
@@ -853,8 +855,8 @@ void adjustpattern(int *pat, int index)
**---------------------------------------------------------------- **----------------------------------------------------------------
*/ */
{ {
if (*pat == index) *pat = 0; if (*pat == index) *pat = 0;
else if (*pat > index) (*pat)--; else if (*pat > index) (*pat)--;
} }
void adjustpatterns(Network *network, int index) void adjustpatterns(Network *network, int index)
@@ -1092,6 +1094,13 @@ void getTmpName(char *fname)
// --- for non-Windows systems: // --- for non-Windows systems:
#else #else
// --- use system function mkstemp() to create a temporary file name // --- use system function mkstemp() to create a temporary file name
/*
int f = -1;
strcpy(fname, "enXXXXXX");
f = mkstemp(fname);
close(f);
remove(fname);
*/
strcpy(fname, "enXXXXXX"); strcpy(fname, "enXXXXXX");
FILE *f = fdopen(mkstemp(fname), "r"); FILE *f = fdopen(mkstemp(fname), "r");
if (f == NULL) strcpy(fname, ""); if (f == NULL) strcpy(fname, "");
@@ -1136,7 +1145,7 @@ char *xstrcpy(char **s1, const char *s2, const size_t n)
if (n2 > n1) *s1 = realloc(*s1, (n2 + 1) * sizeof(char)); if (n2 > n1) *s1 = realloc(*s1, (n2 + 1) * sizeof(char));
// Copy the source string into the destination string // Copy the source string into the destination string
strncpy(*s1, s2, n2); strncpy(*s1, s2, n2+1);
return *s1; return *s1;
} }