pxcloud/spice-common
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-common synced 2026-08-22 13:27:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid integer overflow computing image sizes

Browse Source 
Use always 64, sizes can be 32x32.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Frediano Ziglio 2015-06-19 19:08:55 +01:00
parent 420a15b776
commit 617be0f74b
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python_modules/demarshal.py
View File

@ -346,13 +346,12 @@ def write_validate_array_item(writer, container, item, scope, parent_scope, star
rows = array.size[3]
width_v = write_read_primitive(writer, start, container, width, scope)
rows_v = write_read_primitive(writer, start, container, rows, scope)
# TODO: Handle multiplication overflow
if bpp == 8:
writer.assign(nelements, "%s * %s" % (width_v, rows_v))
writer.assign(nelements, "(uint64_t) %s * %s" % (width_v, rows_v))
elif bpp == 1:
writer.assign(nelements, "((%s + 7) / 8 ) * %s" % (width_v, rows_v))
writer.assign(nelements, "(((uint64_t) %s + 7U) / 8U ) * %s" % (width_v, rows_v))
else:
writer.assign(nelements, "((%s * %s + 7) / 8 ) * %s" % (bpp, width_v, rows_v))
writer.assign(nelements, "((%sU * (uint64_t) %s + 7U) / 8U ) * %s" % (bpp, width_v, rows_v))
elif array.is_bytes_length():
is_byte_size = True
v = write_read_primitive(writer, start, container, array.size[1], scope)
@ -713,13 +712,12 @@ def read_array_len(writer, prefix, array, dest, scope, is_ptr):
rows = array.size[3]
width_v = dest.get_ref(width)
rows_v = dest.get_ref(rows)
# TODO: Handle multiplication overflow
if bpp == 8:
writer.assign(nelements, "%s * %s" % (width_v, rows_v))
writer.assign(nelements, "((uint64_t) %s * %s)" % (width_v, rows_v))
elif bpp == 1:
writer.assign(nelements, "((%s + 7) / 8 ) * %s" % (width_v, rows_v))
writer.assign(nelements, "(((uint64_t) %s + 7U) / 8U ) * %s" % (width_v, rows_v))
else:
writer.assign(nelements, "((%s * %s + 7) / 8 ) * %s" % (bpp, width_v, rows_v))
writer.assign(nelements, "((%sU * (uint64_t) %s + 7U) / 8U ) * %s" % (bpp, width_v, rows_v))
elif array.is_bytes_length():
writer.assign(nelements, dest.get_ref(array.size[2]))
else:

7
python_modules/marshal.py
View File

@ -172,13 +172,12 @@ def get_array_size(array, container_src):
rows = array.size[3]
width_v = container_src.get_ref(width)
rows_v = container_src.get_ref(rows)
# TODO: Handle multiplication overflow
if bpp == 8:
return "(unsigned) (%s * %s)" % (width_v, rows_v)
return "((uint64_t) %s * %s)" % (width_v, rows_v)
elif bpp == 1:
return "(unsigned) (((%s + 7) / 8 ) * %s)" % (width_v, rows_v)
return "((((uint64_t) %s + 7U) / 8U ) * %s)" % (width_v, rows_v)
else:
return "(unsigned) (((%s * %s + 7) / 8 ) * %s)" % (bpp, width_v, rows_v)
return "((((uint64_t) %s * %s + 7U) / 8U ) * %s)" % (bpp, width_v, rows_v)
elif array.is_bytes_length():
return container_src.get_ref(array.size[2])
else: