branch | stable |
changeset 38188 | 1acfc35d478c |
parent 38187 | 90a274965de7 |
child 38189 | faa924469635 |
--- a/mercurial/mpatch.c Sat Apr 28 00:42:16 2018 -0400 +++ b/mercurial/mpatch.c Sat Apr 28 02:04:56 2018 -0400 @@ -248,7 +248,7 @@ char *p = buf; while (f != l->tail) { - if (f->start < last || f->end > len) { + if (f->start < last || f->end > len || last < 0) { return MPATCH_ERR_INVALID_PATCH; } memcpy(p, orig + last, f->start - last); @@ -258,6 +258,9 @@ p += f->len; f++; } + if (last < 0) { + return MPATCH_ERR_INVALID_PATCH; + } memcpy(p, orig + last, len - last); return 0; }