Fix segfault caused by off by one error

For the love of god, please
i swear
2019-01-15 11:39:57 -08:00 · 2019-01-14 18:58:24 -08:00 · 2019-01-14 17:37:37 -08:00 · 2019-01-14 17:31:50 -08:00 · 2019-01-14 17:06:39 -08:00
2 changed files with 7 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,12 +8,16 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)

 find_package(Curses REQUIRED)
+find_library(TINFO_LIBRARY tinfo)
+if(NOT TINFO_LIBRARY)
+	set(TINFO_LIBRARY "")
+endif()
 set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include)

 add_executable (roflcat src/roflcat.cpp src/cmd.cpp)
 target_include_directories(roflcat PUBLIC ${INCLUDE_PATH})
-target_include_directories(roflcat PUBLIC ${CURSES_INCLUDE_DIRS})
-target_link_libraries(roflcat PRIVATE ${CURSES_LIBRARIES})
+target_include_directories(roflcat PUBLIC ${CURSES_INCLUDE_DIRS} ${TINFO_INCLUDE_DIRS})
+target_link_libraries(roflcat PRIVATE ${CURSES_LIBRARIES} ${TINFO_LIBRARY})
 install(TARGETS roflcat RUNTIME DESTINATION bin)

 #uninstall target
--- a/src/cmd.cpp
+++ b/src/cmd.cpp
@@ -201,7 +201,7 @@ static constexpr size_t strlen_pre_eq(const char* str){

 #define CHECK_VALID_SHORT_ARG(opt, arg, type) \
 	{ \
-		if(next_arg == (argc-1) || !is_##type(arg)){ \
+		if(next_arg == argc || !is_##type(arg)){ \
 			fwprintf(stderr, L"'-%s' requires an argument of type " #type "\n", opt); \
 			ret.error = 1; \
 			break; \
Author	SHA1	Message	Date
rexy712	f0247ac9c5	Fix segfault caused by off by one error	2019-01-15 11:39:57 -08:00
rexy712	adea8f719e	For the love of god, please	2019-01-14 18:58:24 -08:00
rexy712	c25594ccda	i swear	2019-01-14 17:37:37 -08:00
rexy712	138c20ba28	actually fixed tinfo	2019-01-14 17:31:50 -08:00
rexy712	8c561778ee	should work on systems where tinfo is separate from ncurses now	2019-01-14 17:06:39 -08:00