diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2016-09-21 07:12:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-21 07:12:51 +0000 |
| commit | ad90940e82c0039372d68f3136791851994557a9 (patch) | |
| tree | 00ce29745cadfad9f1497c534fe3c7f47ad20672 /func | |
| parent | 8664db2de47ca768108e22499302e36e58ac9d6d (diff) | |
| parent | fd3040c8eaa96ed14a75fbd34e009da1e59dd947 (diff) | |
Merge "Fix issues found in security review"
Diffstat (limited to 'func')
| -rw-r--r-- | func/env_setup.py | 2 | ||||
| -rw-r--r-- | func/spawn_vm.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/func/env_setup.py b/func/env_setup.py index 96f984cb..3697f235 100644 --- a/func/env_setup.py +++ b/func/env_setup.py @@ -174,7 +174,7 @@ class Env_setup: def parse(self, config_file_path): try: f_name = open(config_file_path, 'r+') - doc = yaml.load(f_name) + doc = yaml.safe_load(f_name) f_name.close() if doc['Scenario']['benchmark']: self.benchmark = doc['Scenario']['benchmark'] diff --git a/func/spawn_vm.py b/func/spawn_vm.py index 15c26861..5710308b 100644 --- a/func/spawn_vm.py +++ b/func/spawn_vm.py @@ -65,7 +65,7 @@ class SpawnVM(Env_setup): Heat_Dic = {}
try:
with open('./heat/SampleHeat.yaml', 'r+') as H_temp:
- Heat_Dic = yaml.load(H_temp)
+ Heat_Dic = yaml.safe_load(H_temp)
except yaml.YAMLError as exc:
if hasattr(exc, 'problem_mark'):
mark = exc.problem_mark
|