Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-21 16:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

waf: fixed unnecessary nul termination of ROMFS

Browse Source
This commit is contained in:
Andrew Tridgell 2019-10-25 20:10:51 +11:00
parent 7fb44d1164
commit 4e33aff5d6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/ardupilotwaf/embed.py
View File

@ -34,12 +34,14 @@ def embed_file(out, f, idx, embedded_name, uncompressed):
compressed = tempfile.NamedTemporaryFile()
if uncompressed:
compressed.write(open(f,'rb').read())
# ensure nul termination
if sys.version_info[0] >= 3:
compressed.write(bytearray(0))
nul = bytearray(0)
else:
compressed.write(chr(0))
nul = chr(0)
if contents[-1] != nul:
contents += nul
compressed.write(contents)
else:
# compress it
f = open(compressed.name, "wb")