mercurial-crew-with-dirclash: comparison mercurial/mpatch.c

equal deleted inserted replaced

-:801756d0ca84
+:681c5c211b92
 #include <sys/types.h>
 #include <arpa/inet.h>
 #endif
 static char mpatch_doc[] = "Efficient binary patching.";
+static PyObject *mpatch_Error;
 struct frag {
 	int start, end, len;
 	char *data;
 };
 		if (!a->base) {
 			free(a);
 			a = NULL;
 		} else
 			a->head = a->tail = a->base;
-	}
+			return a;
-	return a;
+	}
+	if (!PyErr_Occurred())
+		PyErr_NoMemory();
+	return NULL;
 }
 static void lfree(struct flist *a)
 {
 	if (a) {
 	char *end = bin + len;
 	char decode[12]; /* for dealing with alignment issues */
 	/* assume worst case size, we won't have many of these lists */
 	l = lalloc(len / 12);
+	if (!l)
+		return NULL;
 	lt = l->tail;
 	while (bin < end) {
 		memcpy(decode, bin, 12);
 		lt->start = ntohl(*(uint32_t *)decode);
 		lt->data = bin + 12;
 		bin += 12 + lt->len;
 		lt++;
 	}
+	if (bin != end) {
+		if (!PyErr_Occurred())
+			PyErr_SetString(mpatch_Error, "patch cannot be decoded");
+		lfree(l);
+		return NULL;
+	}
 	l->tail = lt;
 	return l;
 }
 /* calculate the size of resultant text */
 {
 	int outlen = 0, last = 0;
 	struct frag *f = l->head;
 	while (f != l->tail) {
+		if (f->start < last || f->end > len) {
+			if (!PyErr_Occurred())
+				PyErr_SetString(mpatch_Error,
+				                "invalid patch");
+			return -1;
+		}
 		outlen += f->start - last;
 		last = f->end;
 		outlen += f->len;
 		f++;
 	}
 	outlen += len - last;
 	return outlen;
 }
-static void apply(char *buf, char *orig, int len, struct flist *l)
+static int apply(char *buf, char *orig, int len, struct flist *l)
 {
 	struct frag *f = l->head;
 	int last = 0;
 	char *p = buf;
 	while (f != l->tail) {
+		if (f->start < last || f->end > len) {
+			if (!PyErr_Occurred())
+				PyErr_SetString(mpatch_Error,
+				                "invalid patch");
+			return 0;
+		}
 		memcpy(p, orig + last, f->start - last);
 		p += f->start - last;
 		memcpy(p, f->data, f->len);
 		last = f->end;
 		p += f->len;
 		f++;
 	}
 	memcpy(p, orig + last, len - last);
+	return 1;
 }
 /* recursively generate a patch of all bins between start and end */
 static struct flist *fold(PyObject *bins, int start, int end)
 {
 		return text;
 	}
 	patch = fold(bins, 0, len);
 	if (!patch)
-		return PyErr_NoMemory();
+		return NULL;
 	outlen = calcsize(PyString_Size(text), patch);
+	if (outlen < 0) {
+		result = NULL;
+		goto cleanup;
+	}
 	result = PyString_FromStringAndSize(NULL, outlen);
-	if (result) {
+	if (!result) {
-		in = PyString_AsString(text);
+		result = NULL;
-		out = PyString_AsString(result);
+		goto cleanup;
-		apply(out, in, PyString_Size(text), patch);
+	}
-	}
+	in = PyString_AsString(text);
+	out = PyString_AsString(result);
+	if (!apply(out, in, PyString_Size(text), patch)) {
+		Py_DECREF(result);
+		result = NULL;
+	}
+cleanup:
 	lfree(patch);
 	return result;
 }
 static PyMethodDef methods[] = {
 PyMODINIT_FUNC
 initmpatch(void)
 {
 	Py_InitModule3("mpatch", methods, mpatch_doc);
-}
+	mpatch_Error = PyErr_NewException("mpatch.mpatchError", NULL, NULL);
+}

changeset 1722	681c5c211b92
parent 597	e530637ea060
child 1746	299c3e26ee45