@@ -76,11 +76,7 @@ static void *grow_buffer(void *buffer, size_t length, size_t *capacity,
76
76
77
77
// Can we fit potentially nbytes tokens (+ null terminators) in the stream?
78
78
while ((length + space >= cap ) && (newbuffer != NULL )) {
79
- if (cap < 1024 * 1024 * 1024 ) {
80
- cap = cap ? cap << 1 : 2 ;
81
- } else {
82
- cap *= 2 ;
83
- }
79
+ cap = cap ? cap << 1 : 2 ;
84
80
buffer = newbuffer ;
85
81
newbuffer = safe_realloc (newbuffer , elsize * cap );
86
82
}
@@ -457,7 +453,7 @@ static int end_line(parser_t *self) {
457
453
return 0 ;
458
454
}
459
455
460
- if (!(self -> lines <= (unsigned long ) self -> header_end + 1 ) &&
456
+ if (!(self -> lines <= (int64_t ) self -> header_end + 1 ) &&
461
457
(self -> expected_fields < 0 && fields > ex_fields ) && !(self -> usecols )) {
462
458
// increment file line count
463
459
self -> file_lines ++ ;
@@ -492,7 +488,7 @@ static int end_line(parser_t *self) {
492
488
}
493
489
} else {
494
490
// missing trailing delimiters
495
- if ((self -> lines >= (unsigned long ) self -> header_end + 1 ) &&
491
+ if ((self -> lines >= (int64_t ) self -> header_end + 1 ) &&
496
492
fields < ex_fields ) {
497
493
// might overrun the buffer when closing fields
498
494
if (make_stream_space (self , ex_fields - fields ) < 0 ) {
@@ -1299,11 +1295,7 @@ int parser_trim_buffers(parser_t *self) {
1299
1295
}
1300
1296
1301
1297
/* trim line_start, line_fields */
1302
- if (new_cap < 1024 * 1024 * 1024 ) {
1303
- new_cap = _next_pow2 (self -> lines ) + 1 ;
1304
- } else {
1305
- new_cap *= 2 ;
1306
- }
1298
+ new_cap = _next_pow2 (self -> lines ) + 1 ;
1307
1299
if (new_cap < self -> lines_cap ) {
1308
1300
TRACE (("parser_trim_buffers: new_cap < self->lines_cap\n" ));
1309
1301
newptr = safe_realloc ((void * )self -> line_start ,
0 commit comments