NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-16 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash if you create a file named IOS in the image dir

Browse Source 
Fix #419
This commit is contained in:
Julien Duponchelle 2016-02-05 10:29:27 +01:00
parent 373113545f
commit 3fc64bced2
No known key found for this signature in database
GPG Key ID: F1E2485547D4595D
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gns3server/modules/dynamips/__init__.py
View File

@ -710,10 +710,12 @@ class Dynamips(BaseManager):
"""
image_dir = self.get_images_directory()
if not os.path.exists(image_dir):
return []
try:
files = os.listdir(image_dir)
except FileNotFoundError:
return []
except OSError as e:
raise DynamipsError("Can not list {}: {}".format(image_dir, str(e)))
files.sort()
images = []
for filename in files:
@ -724,7 +726,6 @@ class Dynamips(BaseManager):
# read the first 7 bytes of the file.
elf_header_start = f.read(7)
except OSError as e:
print(e)
continue
# valid IOS images must start with the ELF magic number, be 32-bit, big endian and have an ELF version of 1
if elf_header_start == b'\x7fELF\x01\x02\x01':