Skip to content

Commit abae24d

Browse files
committed
BUG: Fixed incorrect stream size check (pandas-dev#14125)
1 parent a62fdf8 commit abae24d

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

pandas/src/parser/tokenizer.c

+8-3
Original file line numberDiff line numberDiff line change
@@ -592,9 +592,9 @@ static int parser_buffer_bytes(parser_t *self, size_t nbytes) {
592592
TRACE( \
593593
("PUSH_CHAR: Pushing %c, slen= %d, stream_cap=%zu, stream_len=%zu\n", \
594594
c, slen, self->stream_cap, self->stream_len)) \
595-
if (slen >= maxstreamsize) { \
595+
if (slen >= self->stream_cap) { \
596596
TRACE(("PUSH_CHAR: ERROR!!! slen(%d) >= maxstreamsize(%d)\n", slen, \
597-
maxstreamsize)) \
597+
self->stream_len)) \
598598
int bufsize = 100; \
599599
self->error_msg = (char *)malloc(bufsize); \
600600
snprintf(self->error_msg, bufsize, \
@@ -708,10 +708,16 @@ int skip_this_line(parser_t *self, int64_t rownum) {
708708
}
709709
}
710710

711+
<<<<<<< f1cfe5b4eb614f9b4e201e764e9bd25f2389b355
711712
int tokenize_bytes(parser_t *self, size_t line_limit, int start_lines) {
712713
int i, slen;
713714
int should_skip;
714715
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)
715721
char c;
716722
char *stream;
717723
char *buf = self->data + self->datapos;
@@ -723,7 +729,6 @@ int tokenize_bytes(parser_t *self, size_t line_limit, int start_lines) {
723729

724730
stream = self->stream + self->stream_len;
725731
slen = self->stream_len;
726-
maxstreamsize = self->stream_cap;
727732

728733
TRACE(("%s\n", buf));
729734

0 commit comments

Comments
 (0)