fix: reading memory of stack allocated object past its scope (leejet#91)

Green-Sky · web-flow · commit f469b835a32f · 2023-11-27T21:37:12.000+08:00
diff --git a/common/common.cpp b/common/common.cpp
@@ -370,7 +370,7 @@ std::string basename(const std::string& path) {
     return path;
 }
 
-const char* get_image_params(SDParams params, int seed) {
+std::string get_image_params(SDParams params, int seed) {
     std::string parameter_string = params.prompt + "\n";
     if (params.negative_prompt.size() != 0) {
         parameter_string += "Negative prompt: " + params.negative_prompt + "\n";
@@ -387,5 +387,5 @@ const char* get_image_params(SDParams params, int seed) {
     }
     parameter_string += ", ";
     parameter_string += "Version: stable-diffusion.cpp";
-    return parameter_string.c_str();
-}
+    return parameter_string;
+}
diff --git a/common/common.h b/common/common.h
@@ -40,4 +40,4 @@ void print_usage(int argc, const char* argv[]);
 
 void parse_args(int argc, const char** argv, SDParams& params);
 
-const char* get_image_params(SDParams params, int seed);
+std::string get_image_params(SDParams params, int seed);
diff --git a/examples/cli/main.cpp b/examples/cli/main.cpp
@@ -87,7 +87,7 @@ int main(int argc, const char* argv[]) {
     std::string dummy_name = last != std::string::npos ? params.output_path.substr(0, last) : params.output_path;
     for (int i = 0; i < params.batch_count; i++) {
         std::string final_image_path = i > 0 ? dummy_name + "_" + std::to_string(i + 1) + ".png" : dummy_name + ".png";
-        stbi_write_png(final_image_path.c_str(), params.width, params.height, 3, results[i], 0, get_image_params(params, params.seed + i));
+        stbi_write_png(final_image_path.c_str(), params.width, params.height, 3, results[i], 0, get_image_params(params, params.seed + i).c_str());
         printf("save result image to '%s'\n", final_image_path.c_str());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,4 @@ void print_usage(int argc, const char* argv[]);`
`40`	`40`
`41`	`41`	`void parse_args(int argc, const char** argv, SDParams& params);`
`42`	`42`
`43`		`-const char* get_image_params(SDParams params, int seed);`
	`43`	`+std::string get_image_params(SDParams params, int seed);`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ int main(int argc, const char* argv[]) {`
`87`	`87`	`std::string dummy_name = last != std::string::npos ? params.output_path.substr(0, last) : params.output_path;`
`88`	`88`	`for (int i = 0; i < params.batch_count; i++) {`
`89`	`89`	`std::string final_image_path = i > 0 ? dummy_name + "_" + std::to_string(i + 1) + ".png" : dummy_name + ".png";`
`90`		`- stbi_write_png(final_image_path.c_str(), params.width, params.height, 3, results[i], 0, get_image_params(params, params.seed + i));`
	`90`	`+ stbi_write_png(final_image_path.c_str(), params.width, params.height, 3, results[i], 0, get_image_params(params, params.seed + i).c_str());`
`91`	`91`	`printf("save result image to '%s'\n", final_image_path.c_str());`
`92`	`92`	`}`
`93`	`93`