int next = END_NOT_FOUND;
int skip = 0;
- for (; pc->overread > 0; pc->overread--) {
- pc->buffer[pc->index++]= pc->buffer[pc->overread_index++];
+ if (pc->overread > 0) {
+ memmove(pc->buffer + pc->index, pc->buffer + pc->overread_index, pc->overread);
+ pc->index += pc->overread;
+ pc->overread_index += pc->overread;
+ pc->overread = 0;
}
if (pnmpc->remaining_bytes) {
sync = bs;
c = *bs++;
if (c == '#') {
- while (c != '\n' && bs < end)
- c = *bs++;
+ uint8_t *match = memchr(bs, '\n', end-bs);
+ if (match)
+ bs = match + 1;
+ else
+ break;
} else if (c == 'P') {
next = bs - pnmctx.bytestream_start + skip - 1;
pnmpc->ascii_scan = 0;