Skip to content
Snippets Groups Projects
Verified Commit 7c62d021 authored by Tim Kaune's avatar Tim Kaune
Browse files

Apply patch to f2c to fix buffer overflow

This can happen for long FORTRAN variable declarations.
New buffer size of 255 byte should be enough for basically all cases.
parent cd79f745
No related branches found
No related tags found
No related merge requests found
......@@ -179,6 +179,16 @@ add_custom_command(
VERBATIM
)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/output.c"
COMMAND ${CMAKE_COMMAND} -E copy "${F2C_SOURCE_DIR}/output.c" "${CMAKE_CURRENT_BINARY_DIR}"
COMMAND ${PATCH_EXE} -e -V none "${CMAKE_CURRENT_BINARY_DIR}/output.c" "${CMAKE_CURRENT_SOURCE_DIR}/fix-buffer-size.patch"
DEPENDS "${F2C_SOURCE_DIR}/output.c" "${CMAKE_CURRENT_SOURCE_DIR}/fix-buffer-size.patch"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
COMMENT "Patching f2c..."
VERBATIM
)
set(
F2C_SOURCES
"cds.c"
......@@ -201,7 +211,6 @@ set(
"misc.c"
"names.c"
"niceprintf.c"
"output.c"
"p1output.c"
"parse_args.c"
"pread.c"
......@@ -231,6 +240,10 @@ set(
"usignal.h"
)
list(TRANSFORM F2C_SOURCES PREPEND "${F2C_SOURCE_DIR}/")
list(
APPEND F2C_SOURCES
"${CMAKE_CURRENT_BINARY_DIR}/output.c"
)
list(TRANSFORM F2C_HEADERS PREPEND "${F2C_SOURCE_DIR}/")
list(
APPEND F2C_HEADERS
......
474c
static char real_buf[255], imag_buf[255];
.
......@@ -324,7 +324,7 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy "${LIBF2C_SOURCE_DIR}/main.c" "${LIBF2C_SOURCE_DIR}/getarg_.c" "${CMAKE_CURRENT_BINARY_DIR}"
COMMAND ${PATCH_EXE} -e -V none "${CMAKE_CURRENT_BINARY_DIR}/main.c" "${CMAKE_CURRENT_SOURCE_DIR}/move-xargc-and-xargv.main.patch"
COMMAND ${PATCH_EXE} -e -V none "${CMAKE_CURRENT_BINARY_DIR}/getarg_.c" "${CMAKE_CURRENT_SOURCE_DIR}/move-xargc-and-xargv.getarg_.patch"
DEPENDS "${LIBF2C_SOURCE_DIR}/main.c" "${LIBF2C_SOURCE_DIR}/getarg_.c"
DEPENDS "${LIBF2C_SOURCE_DIR}/main.c" "${LIBF2C_SOURCE_DIR}/getarg_.c" "${CMAKE_CURRENT_SOURCE_DIR}/move-xargc-and-xargv.main.patch" "${CMAKE_CURRENT_SOURCE_DIR}/move-xargc-and-xargv.getarg_.patch"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
COMMENT "Patching libf2c..."
VERBATIM
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment