vsftpd/fix-str_open.patch

--- sysstr-orig.c	2022-07-27 09:44:52.606408000 +0200
+++ sysstr.c	2022-07-27 09:54:24.043081352 +0200
@@ -74,19 +74,11 @@
 int
 str_open(const struct mystr* p_str, const enum EVSFSysStrOpenMode mode)
 {
-  enum EVSFSysUtilOpenMode open_mode = kVSFSysUtilOpenUnknown;
-  switch (mode)
-  {
-    case kVSFSysStrOpenReadOnly:
-      open_mode = kVSFSysUtilOpenReadOnly;
-      break;
-    case kVSFSysStrOpenUnknown:
-      /* Fall through */
-    default:
-      bug("unknown mode value in str_open");
-      break;
-  }
-  return vsf_sysutil_open_file(str_getbuf(p_str), open_mode);
+  if (mode == kVSFSysStrOpenReadOnly)
+    return vsf_sysutil_open_file(str_getbuf(p_str), kVSFSysUtilOpenReadOnly);
+
+  bug("unknown mode value in str_open");
+  return -1;
 }
 
 int
rebase to version 3.0.5 2022-07-29 18:10:46 +00:00			`--- sysstr-orig.c 2022-07-27 09:44:52.606408000 +0200`
			`+++ sysstr.c 2022-07-27 09:54:24.043081352 +0200`
Fix str_open() in a different way The original patch tried to fix it by not assigning anything to open_mode. That only works if the compiler is able to deduce that bug() will abort the process however (or just not warn about the uninitialized use of open_mode). clang does warn about open_mode being used uninitialized in this function. Solve this by rewriting the function to simply only consider one case, the mode == kVSFSysStrOpenReadOnly one. Otherwise, don't call vsf_sysutil_open_file() and just return -1 after calling bug(). 2020-11-17 09:16:57 +00:00			`@@ -74,19 +74,11 @@`
			`int`
			`str_open(const struct mystr* p_str, const enum EVSFSysStrOpenMode mode)`
			`{`
rebase to version 3.0.5 2022-07-29 18:10:46 +00:00			`- enum EVSFSysUtilOpenMode open_mode = kVSFSysUtilOpenUnknown;`
Fix str_open() in a different way The original patch tried to fix it by not assigning anything to open_mode. That only works if the compiler is able to deduce that bug() will abort the process however (or just not warn about the uninitialized use of open_mode). clang does warn about open_mode being used uninitialized in this function. Solve this by rewriting the function to simply only consider one case, the mode == kVSFSysStrOpenReadOnly one. Otherwise, don't call vsf_sysutil_open_file() and just return -1 after calling bug(). 2020-11-17 09:16:57 +00:00			`- switch (mode)`
			`- {`
			`- case kVSFSysStrOpenReadOnly:`
			`- open_mode = kVSFSysUtilOpenReadOnly;`
			`- break;`
			`- case kVSFSysStrOpenUnknown:`
			`- /* Fall through */`
			`- default:`
			`- bug("unknown mode value in str_open");`
			`- break;`
			`- }`
			`- return vsf_sysutil_open_file(str_getbuf(p_str), open_mode);`
			`+ if (mode == kVSFSysStrOpenReadOnly)`
			`+ return vsf_sysutil_open_file(str_getbuf(p_str), kVSFSysUtilOpenReadOnly);`
			`+`
			`+ bug("unknown mode value in str_open");`
			`+ return -1;`
			`}`

			`int`