From 42d8d695406d58f4f66350d08fa7346fc7ab485d Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 11 Feb 2012 11:48:37 +0200 Subject: fixed buffer overflow in optimized builds few more dependencies droped --- server/server/Makefile | 6 +++--- server/server/config.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/server/Makefile b/server/server/Makefile index 548d5f2..5eab6b8 100644 --- a/server/server/Makefile +++ b/server/server/Makefile @@ -1,7 +1,7 @@ all: - #g++ -c *.cpp -I/usr/include -O2 -pipe -msse -fomit-frame-pointer - g++ -c *.cpp -I/usr/include -g3 -ggdb -pthread - g++ -o server *.o /usr/lib/libcurl.a /usr/lib/libidn.a -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lrt /usr/lib/libssl.a /usr/lib/libcrypto.a /usr/lib/libz.a /usr/lib/libboost_system-mt.a /usr/lib/libboost_date_time-mt.a /usr/lib/libboost_thread-mt.a /usr/lib/libboost_random-mt.a /usr/lib/libboost_filesystem-mt.a -static-libstdc++ -static-libgcc -lpthread -Wl,-O1 -s + g++ -c *.cpp -I/usr/include -O2 -ggdb -g3 -pthread + #g++ -o server *.o /usr/lib/libcurl.a /usr/lib/libidn.a /usr/lib/libssl.a /usr/lib/libcrypto.a -ldl -lrt /usr/lib/libz.a /usr/lib/libboost_system-mt.a /usr/lib/libboost_date_time-mt.a /usr/lib/libboost_thread-mt.a /usr/lib/libboost_random-mt.a /usr/lib/libboost_filesystem-mt.a -static-libstdc++ -static-libgcc -lpthread -Wl,-O1 -s + g++ -o server *.o /usr/lib/libcurl.a /usr/lib/libidn.a /usr/lib/libssl.a /usr/lib/libcrypto.a -ldl -lrt /usr/lib/libz.a /usr/lib/libboost_system-mt.a /usr/lib/libboost_date_time-mt.a /usr/lib/libboost_thread-mt.a /usr/lib/libboost_random-mt.a /usr/lib/libboost_filesystem-mt.a -static-libstdc++ -static-libgcc -lpthread clean: rm *.o diff --git a/server/server/config.cpp b/server/server/config.cpp index d8a9cfa..51a082a 100755 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -233,7 +233,7 @@ void config::load_upload_list(char *pth) file.close(); unsigned char result[MD5_DIGEST_LENGTH]; MD5_Final(result, &c); - char result_f[2]; + char result_f[6]; for(int i = 0; i