mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-05 16:20:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Corrected clang-reported issue: Static array bounds overrun.

Browse Source
This commit is contained in:
Ward Fisher 2014-04-21 10:49:39 -06:00
parent 18f23a0e47
commit a4f6cfa1c3
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ncgen3/CMakeLists.txt
View File

@ -8,39 +8,38 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE) FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)
IF(NOT EXISTS ${netCDF_SOURCE_DIR}/ncgen3/ncgentab.c AND NOT EXISTS IF(NOT EXISTS ${netCDF_SOURCE_DIR}/ncgen3/ncgentab.c AND NOT EXISTS
${netCDF_SOURCE_DIR}/ncgen3/ncgentab.h) ${netCDF_SOURCE_DIR}/ncgen3/ncgentab.h)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ncgentab.c ${CMAKE_CURRENT_SOURCE_DIR}/ncgentab.h OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ncgentab.c ${CMAKE_CURRENT_SOURCE_DIR}/ncgentab.h
COMMAND bison -pncg -d ${netCDF_SOURCE_DIR}/ncgen3/ncgen.y COMMAND bison -pncg -d ${netCDF_SOURCE_DIR}/ncgen3/ncgen.y
COMMAND mv ncgen.tab.c ${netCDF_SOURCE_DIR}/ncgen3/ncgentab.c COMMAND mv ncgen.tab.c ${netCDF_SOURCE_DIR}/ncgen3/ncgentab.c
COMMAND mv ncgen.tab.h ${netCDF_SOURCE_DIR}/ncgen3/ncgentab.h COMMAND mv ncgen.tab.h ${netCDF_SOURCE_DIR}/ncgen3/ncgentab.h
VERBATIM VERBATIM
) )
ENDIF() ENDIF()
IF(USE_X_GETOPT) IF(USE_X_GETOPT)
SET(ncgen3_FILES ${ncgen3_FILES} XGetopt.c) SET(ncgen3_FILES ${ncgen3_FILES} XGetopt.c)
ENDIF() ENDIF()
ADD_EXECUTABLE(ncgen3 ${ncgen3_FILES}) ADD_EXECUTABLE(ncgen3 ${ncgen3_FILES})
TARGET_LINK_LIBRARIES(ncgen3 netcdf) TARGET_LINK_LIBRARIES(ncgen3 netcdf ${ALL_TLL_LIBS})
IF(ENABLE_TESTS) IF(ENABLE_TESTS)
SET(NCGEN3_TESTS run_tests) SET(NCGEN3_TESTS run_tests)
IF(USE_NETCDF4) IF(USE_NETCDF4)
SET(NCGEN3_TESTS ${NCGEN3_TESTS} run_nc4_tests) SET(NCGEN3_TESTS ${NCGEN3_TESTS} run_nc4_tests)
ENDIF() ENDIF()
FOREACH(F ${NCGEN3_TESTS}) FOREACH(F ${NCGEN3_TESTS})
add_sh_test(ncgen3 ${F}) add_sh_test(ncgen3 ${F})
#ADD_TEST(ncgen3_${F} sh ${CMAKE_CURRENT_BINARY_DIR}/${F}.sh) ENDFOREACH()
ENDFOREACH()
ENDIF() ENDIF()
INSTALL(TARGETS ncgen3 DESTINATION bin COMPONENT utilities) INSTALL(TARGETS ncgen3 DESTINATION bin COMPONENT utilities)
SET(MAN_FILES ncgen3.1) SET(MAN_FILES ncgen3.1)
IF(NOT MSVC) IF(NOT MSVC)
INSTALL(FILES ${MAN_FILES} DESTINATION "share/man/man1" COMPONENT documentation) INSTALL(FILES ${MAN_FILES} DESTINATION "share/man/man1" COMPONENT documentation)
ENDIF() ENDIF()
## Specify files to be distributed by 'make dist' ## Specify files to be distributed by 'make dist'

3
ncgen3/load.c
View File

@ -9,6 +9,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <math.h>
#include <assert.h> #include <assert.h>
#include <netcdf.h> #include <netcdf.h>
#include "generic.h" #include "generic.h"
@ -309,7 +310,7 @@ fstrcat(
strncpy(s, t, FORT_MAX_STMNT); strncpy(s, t, FORT_MAX_STMNT);
*slenp = strlen(s); *slenp = strlen(s);
} else { } else {
strncat(s, t, strlen(t)); strncat(s, t, fmin(strlen(t),FORT_MAX_STMNT-strlen(t)));
} }
} }