This is an archive of the discontinued Mercurial Phabricator instance.

revlog: fix type confusion with sidedata_comp_len (issue 6580)
ClosedPublic

Authored by jcristau on Aug 24 2021, 6:44 AM.

Download Raw Diff

Details

Reviewers

marmoute
Alphare

Group Reviewers

hg-reviewers

Commits

rHG16346f3d446d: revlog: fix type confusion with sidedata_comp_len (issue6580)

Summary

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.

Diff Detail

Repository

rHG Mercurial

Branch

stable

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

jcristau created this revision.Aug 24 2021, 6:44 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 24 2021, 6:44 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

Oops.

(this should preferably go on stable.)

Oops indeed. I will take this on stable.

Alphare accepted this revision.Aug 24 2021, 8:34 AM

This revision is now accepted and ready to land.Aug 24 2021, 8:34 AM

This fails clang-format checking, I can amend if that's simpler for you.

jcristau retitled this revision from revlog: fix type confusion with sidedata_comp_len (issue 6580) to revlog: fix type confusion with sidedata_comp_len (issue6580).Aug 24 2021, 9:23 AM

jcristau updated this revision to Diff 29989.

jcristau added a commit: rHG16346f3d446d: revlog: fix type confusion with sidedata_comp_len (issue6580).Aug 24 2021, 9:30 AM

Closed by commit rHG16346f3d446d: revlog: fix type confusion with sidedata_comp_len (issue6580) (authored by jcristau). · Explain Why

This revision was automatically updated to reflect the committed changes.

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Go home baymax, you're drunk

Revision Contents
Changeset List

			Path	Packages
M			mercurial/cext/revlog.c (7 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	29988		Aug 24 2021, 6:44 AM	★	★
Diff 2	29989		Aug 24 2021, 9:23 AM	★	★
Diff 3	29990	rHG16346f3d446dd6cf5d63894306cd9af5e60eb501	Aug 24 2021, 6:44 AM	★	★
Diff 4	29991		Aug 24 2021, 9:41 AM	★	★

Commit	Parents	Author	Summary	Date
d35aa934a871	df94c13ddf60	Julien Cristau		Aug 24 2021, 6:44 AM

Diff 29991

mercurial/cext/revlog.c

	PyErr_Format(PyExc_ValueError, "node len %zd != expected node len %zd",			PyErr_Format(PyExc_ValueError, "node len %zd != expected node len %zd",
	thisnodelen, nodelen);			thisnodelen, nodelen);
	return -1;			return -1;
	}			}

	static PyObject index_append(indexObject self, PyObject *obj)			static PyObject index_append(indexObject self, PyObject *obj)
	{			{
	uint64_t offset_flags, sidedata_offset;			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;			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;			const char *c_node_id;
	char comp_field;			char comp_field;
	char *data;			char *data;

	if (!PyArg_ParseTuple(obj, tuple_format, &offset_flags, &comp_len,			if (!PyArg_ParseTuple(obj, tuple_format, &offset_flags, &comp_len,
	&uncomp_len, &base_rev, &link_rev, &parent_1,			&uncomp_len, &base_rev, &link_rev, &parent_1,
	&parent_2, &c_node_id, &c_node_id_len,			&parent_2, &c_node_id, &c_node_id_len,
	&sidedata_offset, &sidedata_comp_len,			&sidedata_offset, &sidedata_comp_len,
	}			}

	/* Replace an existing index entry's sidedata offset and length with new ones.			/* Replace an existing index entry's sidedata offset and length with new ones.
	This cannot be used outside of the context of sidedata rewriting,			This cannot be used outside of the context of sidedata rewriting,
	inside the transaction that creates the given revision. */			inside the transaction that creates the given revision. */
	static PyObject index_replace_sidedata_info(indexObject self, PyObject *args)			static PyObject index_replace_sidedata_info(indexObject self, PyObject *args)
	{			{
	uint64_t offset_flags, sidedata_offset;			uint64_t offset_flags, sidedata_offset;
	int rev;			int rev, sidedata_comp_len;
	char comp_mode;			char comp_mode;
	Py_ssize_t sidedata_comp_len;
	char *data;			char *data;
	#if LONG_MAX == 0x7fffffffL			#if LONG_MAX == 0x7fffffffL
	const char *const sidedata_format = PY23("nKiKB", "nKiKB");			const char *const sidedata_format = PY23("nKiKB", "nKiKB");
	#else			#else
	const char *const sidedata_format = PY23("nkikB", "nkikB");			const char *const sidedata_format = PY23("nkikB", "nkikB");
	#endif			#endif

	if (self->entry_size == v1_entry_size \|\| self->inlined) {			if (self->entry_size == v1_entry_size \|\| self->inlined) {