File exult-1.4.9rc1-strncat.patch of Package exult

Overview Repositories Revisions Requests Users Attributes Meta

File exult-1.4.9rc1-strncat.patch of Package exult (Revision ee7562efe406aa42c3147ab31c090e04)

Currently displaying revision ee7562efe406aa42c3147ab31c090e04 , Show latest

commit a3f9c9e0aad036d2c559dfd1d075c61eadc87a75
Author: Michal Slonina <michal.slonina@gmail.com>
Date:   Fri Oct 27 13:06:35 2017 +0200

fixed stack overflow in expac and newfile

diff --git a/gumps/Newfile_gump.cc b/gumps/Newfile_gump.cc
index 66ba66d..6fa2296 100644
--- a/gumps/Newfile_gump.cc
+++ b/gumps/Newfile_gump.cc
@@ -618,7 +618,7 @@ void Newfile_gump::paint
 					break;
 				}
 			}
-			std::strncat (info, filename+offset, 320);
+			std::strncat (info, filename+offset, sizeof(info) - strlen(info) - 1);
 
 		}
 
@@ -643,7 +643,7 @@ void Newfile_gump::paint
 					break;
 				}
 			}
-			std::strncat (info, filename+offset, 64);
+			std::strncat (info, filename+offset, sizeof(info) - strlen(info) - 1);
 			sman->paint_text_box (4, info, x+infox, y+infoy, infow, infoh);
 
 		}
diff --git a/tools/expack.cc b/tools/expack.cc
index 9f84c35..d2c0440 100644
--- a/tools/expack.cc
+++ b/tools/expack.cc
@@ -297,13 +297,13 @@ int main(int argc, char **argv)
 					// Read the output file name
 					getline(respfile, temp, 1024);
 					strncpy(fname, path_prefix, 1024);
-					strncat(fname, temp, 1024);
+					strncat(fname, temp, sizeof(fname) - strlen(fname) - 1);
 
 					// Header file name
 					strncpy (hprefix, temp, 1024);
 					make_header_name(hprefix);
 					strncpy (hname, path_prefix, 1024);
-					strncat (hname, hprefix, 1024);
+					strncat (hname, hprefix, sizeof(hname) - strlen(hname) - 1);
 					strncat (hname, ".h", 1024);
 					strip_path (hprefix);
 					make_uppercase (hprefix);
@@ -330,7 +330,7 @@ int main(int argc, char **argv)
 								}
 							char temp2[1024];
 							strncpy(temp2, path_prefix,1024);
-							strncat(temp2, ptr, 1024);
+							strncat(temp2, ptr, sizeof(temp2) - strlen(temp2) - 1);
 							if (shnum >= file_names.size())
 								file_names.resize(shnum + 1);
 							file_names[shnum] = temp2;
@@ -433,7 +433,7 @@ int main(int argc, char **argv)
 			if (!hname[0]) {	// Need header name.
 				strncpy (hprefix, fname, 1024);
 				make_header_name(hprefix);
-				strncat (hname, hprefix, 1024);
+				strncat (hname, hprefix, sizeof(hname) - strlen(hname) - 1);
 				strncat (hname, ".h", 1024);
 			}		
 			try {

Places

File exult-1.4.9rc1-strncat.patch of Package exult (Revision ee7562efe406aa42c3147ab31c090e04)

Places