YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing read_sources: buffer and buffer_size were filled incorrectly.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2014-08-01 14:37:23 +04:00
parent 8260cc0214
commit f4a4c91a98
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+15 -7
View File
@@ -130,12 +130,17 @@ read_sources (const char *script_file_names[],
__rewind( file); __rewind( file);
const size_t source_size = (size_t)script_len; const size_t current_source_size = (size_t)script_len;
size_t bytes_read = 0;
while ( bytes_read < source_size ) if ( source_buffer_tail + current_source_size >= source_buffer + sizeof(source_buffer) )
{ {
bytes_read += __fread( source_buffer_tail, 1, source_size, file); jerry_exit (ERR_MEMORY);
}
size_t bytes_read = 0;
while ( bytes_read < current_source_size )
{
bytes_read += __fread( source_buffer_tail + bytes_read, sizeof(uint8_t), current_source_size - bytes_read, file);
if ( __ferror( file) != 0 ) if ( __ferror( file) != 0 )
{ {
@@ -145,11 +150,14 @@ read_sources (const char *script_file_names[],
__fclose( file); __fclose( file);
source_buffer_tail += source_size; source_buffer_tail += current_source_size;
*out_source_size_p += source_size;
} }
const size_t source_size = (size_t) (source_buffer_tail - source_buffer);
JERRY_ASSERT( source_size < sizeof(source_buffer) );
*out_source_size_p = source_size;
return (const char*)source_buffer; return (const char*)source_buffer;
} }