luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Array.Read() and Array.Write() now check their stream argument instead of crashing if it is NULL.

Browse source 
[INTERPRETER]
* BUG: Array.Read() and Array.Write() now check their stream argument instead of crashing if it is NULL.
This commit is contained in:
gambas 2021-06-10 02:27:09 +02:00
parent 8a191771ec
commit e1202bad7e
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
main/gbx/gbx_c_array.c
View file

@ -1686,30 +1686,38 @@ BEGIN_METHOD_VOID(CARRAY_reverse)
END_METHOD
BEGIN_METHOD(Array_Read, GB_OBJECT file; GB_INTEGER start; GB_INTEGER length)
BEGIN_METHOD(Array_Read, GB_OBJECT stream; GB_INTEGER start; GB_INTEGER length)
int count = THIS->count;
int start = VARGOPT(start, 0);
int length = VARGOPT(length, count);
void *stream = VARG(stream);
if (GB_CheckObject(stream))
return;
if (check_start_length(count, &start, &length))
return;
STREAM_read(CSTREAM_TO_STREAM(VARG(file)), get_data(THIS, start), length * THIS->size);
STREAM_read(CSTREAM_TO_STREAM(stream), get_data(THIS, start), length * THIS->size);
END_METHOD
BEGIN_METHOD(Array_Write, GB_OBJECT file; GB_INTEGER start; GB_INTEGER length)
BEGIN_METHOD(Array_Write, GB_OBJECT stream; GB_INTEGER start; GB_INTEGER length)
int count = THIS->count;
int start = VARGOPT(start, 0);
int length = VARGOPT(length, count);
void *stream = VARG(stream);
if (GB_CheckObject(stream))
return;
if (check_start_length(count, &start, &length))
return;
STREAM_write(CSTREAM_TO_STREAM(VARG(file)), get_data(THIS, start), length * THIS->size);
STREAM_write(CSTREAM_TO_STREAM(stream), get_data(THIS, start), length * THIS->size);
END_METHOD