mpc.c contains diff info
Closed this issue · 2 comments
gou4shi1 commented
For example:
static void mpc_input_mark(mpc_input_t *i) {
if (i->backtrack < 1) { return; }
i->marks_num++;
<<<<<<< HEAD
if (i->marks_num > i->marks_slots) {
i->marks_slots = i->marks_num + i->marks_num / 2;
i->marks = realloc(i->marks, sizeof(mpc_state_t) * i->marks_slots);
i->lasts = realloc(i->lasts, sizeof(char) * i->marks_slots);
}
=======
i->marks = realloc(i->marks, sizeof(mpc_state_t) * i->marks_num);
i->lasts = realloc(i->lasts, sizeof(char) * i->marks_num);
>>>>>>> 9f9925ba69dda75ffc204da4c7809d793510885f
i->marks[i->marks_num-1] = i->state;
i->lasts[i->marks_num-1] = i->last;
if (i->type == MPC_INPUT_PIPE && i->marks_num == 1) {
i->buffer = calloc(1, 1);
}
}
orangeduck commented
Thanks for the report. This should be fixed in the latest commits. Could you verify?
gou4shi1 commented
verified.
thx!