Skip to content

Fix CWE 502 #62345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wanghuancoder merged 6 commits into from
Mar 7, 2024
Merged

Fix CWE 502 #62345

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d8ceec
change pickle load behavior
omri-alon Mar 3, 2024
a71d5c2
remove
omri-alon Mar 3, 2024
faa1db4
f
omri-alon Mar 3, 2024
c18f839
change to raise instead of print
omri-alon Mar 4, 2024
f6e9c52
fix
omri-alon Mar 4, 2024
6ed9385
remove try catch
omri-alon Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions python/paddle/static/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ def _clone_var_in_block(block, var):
)


def _safe_load_pickle(file, encoding="ASCII"):
load_dict = pickle.Unpickler(file, encoding=encoding).load()
return load_dict


def prepend_feed_ops(
inference_program, feed_target_names, feed_holder_name='feed'
):
Expand Down Expand Up @@ -1697,7 +1702,7 @@ def set_var(var, ndarray):
if sys.platform == 'darwin' and sys.version_info.major == 3:
load_dict = _pickle_loads_mac(parameter_file_name, f)
else:
load_dict = pickle.load(f, encoding='latin1')
load_dict = _safe_load_pickle(f, encoding='latin1')
load_dict = _pack_loaded_dict(load_dict)
for v in parameter_list:
assert (
Expand All @@ -1721,7 +1726,7 @@ def set_var(var, ndarray):
)

with open(opt_file_name, 'rb') as f:
load_dict = pickle.load(f, encoding='latin1')
load_dict = _safe_load_pickle(f, encoding='latin1')
for v in optimizer_var_list:
assert (
v.name in load_dict
Expand Down Expand Up @@ -2015,13 +2020,13 @@ def _load_vars_with_try_catch(
if sys.platform == 'darwin' and sys.version_info.major == 3:
para_dict = _pickle_loads_mac(parameter_file_name, f)
else:
para_dict = pickle.load(f, encoding='latin1')
para_dict = _safe_load_pickle(f, encoding='latin1')
para_dict = _pack_loaded_dict(para_dict)

opt_file_name = model_prefix + ".pdopt"
if os.path.exists(opt_file_name):
with open(opt_file_name, 'rb') as f:
opti_dict = pickle.load(f, encoding='latin1')
opti_dict = _safe_load_pickle(f, encoding='latin1')

para_dict.update(opti_dict)

Expand Down