# HG changeset patch
# User Julien Cristau <jcristau@mozilla.com>
# Date 2021-08-24 10:44:34
# Node ID 16346f3d446dd6cf5d63894306cd9af5e60eb501
# Parent  df94c13ddf60b5c355db04d9a6dde9ce80d58df3

revlog: fix type confusion with sidedata_comp_len (issue6580)

The format string uses "i" (int) for sidedata_comp_len, so we shouldn't
be passing a pointer to Py_ssize_t to PyArg_ParseTuple.  On 64-bit
big-endian, this would result in python only writing to the upper 32
bits, and things go downhill from there.

Differential Revision: https://phab.mercurial-scm.org/D11334

diff --git a/mercurial/cext/revlog.c b/mercurial/cext/revlog.c
--- a/mercurial/cext/revlog.c
+++ b/mercurial/cext/revlog.c
@@ -452,9 +452,10 @@ static int node_check(Py_ssize_t nodelen
 static PyObject *index_append(indexObject *self, PyObject *obj)
 {
 	uint64_t offset_flags, sidedata_offset;
-	int rev, comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2;
+	int rev, comp_len, uncomp_len, base_rev, link_rev, parent_1, parent_2,
+	    sidedata_comp_len;
 	char data_comp_mode, sidedata_comp_mode;
-	Py_ssize_t c_node_id_len, sidedata_comp_len;
+	Py_ssize_t c_node_id_len;
 	const char *c_node_id;
 	char comp_field;
 	char *data;
@@ -534,9 +535,8 @@ static PyObject *index_append(indexObjec
 static PyObject *index_replace_sidedata_info(indexObject *self, PyObject *args)
 {
 	uint64_t offset_flags, sidedata_offset;
-	int rev;
+	int rev, sidedata_comp_len;
 	char comp_mode;
-	Py_ssize_t sidedata_comp_len;
 	char *data;
 #if LONG_MAX == 0x7fffffffL
 	const char *const sidedata_format = PY23("nKiKB", "nKiKB");