Use the actual function to check if the path is within the dir. (#15216)

This commit is contained in:
comfyanonymous
2026-08-01 19:15:17 -07:00
committed by GitHub
parent 49a7422892
commit 41a3e160d7

View File

@@ -549,11 +549,10 @@ def get_save_image_path(filename_prefix: str, output_dir: str, image_width=0, im
full_output_folder = os.path.join(output_dir, subfolder) full_output_folder = os.path.join(output_dir, subfolder)
if os.path.commonpath((output_dir, os.path.abspath(full_output_folder))) != output_dir: if not is_within_directory(output_dir, full_output_folder):
err = "**** ERROR: Saving image outside the output folder is not allowed." + \ err = "**** ERROR: Saving image outside the output folder is not allowed." + \
"\n full_output_folder: " + os.path.abspath(full_output_folder) + \ "\n full_output_folder: " + os.path.abspath(full_output_folder) + \
"\n output_dir: " + output_dir + \ "\n output_dir: " + output_dir
"\n commonpath: " + os.path.commonpath((output_dir, os.path.abspath(full_output_folder)))
logging.error(err) logging.error(err)
raise Exception(err) raise Exception(err)