@@ -592,9 +592,9 @@ static int parser_buffer_bytes(parser_t *self, size_t nbytes) {
592
592
TRACE( \
593
593
("PUSH_CHAR: Pushing %c, slen= %d, stream_cap=%zu, stream_len=%zu\n", \
594
594
c, slen, self->stream_cap, self->stream_len)) \
595
- if (slen >= maxstreamsize ) { \
595
+ if (slen >= self->stream_cap ) { \
596
596
TRACE(("PUSH_CHAR: ERROR!!! slen(%d) >= maxstreamsize(%d)\n", slen, \
597
- maxstreamsize)) \
597
+ self->stream_len)) \
598
598
int bufsize = 100; \
599
599
self->error_msg = (char *)malloc(bufsize); \
600
600
snprintf(self->error_msg, bufsize, \
@@ -708,10 +708,16 @@ int skip_this_line(parser_t *self, int64_t rownum) {
708
708
}
709
709
}
710
710
711
+ <<<<<<< f1cfe5b4eb614f9b4e201e764e9bd25f2389b355
711
712
int tokenize_bytes (parser_t * self , size_t line_limit , int start_lines ) {
712
713
int i , slen ;
713
714
int should_skip ;
714
715
long maxstreamsize ;
716
+ = == == ==
717
+ int tokenize_bytes (parser_t * self , size_t line_limit )
718
+ {
719
+ int i , slen , start_lines ;
720
+ >>>>>>> BUG : Fixed incorrect stream size check (#14125 )
715
721
char c ;
716
722
char * stream ;
717
723
char * buf = self -> data + self -> datapos ;
@@ -723,7 +729,6 @@ int tokenize_bytes(parser_t *self, size_t line_limit, int start_lines) {
723
729
724
730
stream = self -> stream + self -> stream_len ;
725
731
slen = self -> stream_len ;
726
- maxstreamsize = self -> stream_cap ;
727
732
728
733
TRACE (("%s\n" , buf ));
729
734
0 commit comments