This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11335

revlog: fix more type confusion in index_replace_sidedata_info (issue6580)
ClosedPublic

Authored by jcristau on Aug 24 2021, 5:45 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8d297f3563be: revlog: fix more type confusion in index_replace_sidedata_info (issue6580)
rHG4db5f465283b: revlog: fix more type confusion in index_replace_sidedata_info (issue6580)
Summary

We were telling python that "rev" was a Py_ssize_t (via the "n" format),
but it was actually an int.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

jcristau created this revision.Aug 24 2021, 5:45 PM
Alphare added a subscriber: Alphare.Aug 25 2021, 4:56 AM

Thanks again for finding this. I have no idea why I started using n all of a sudden where the rest of the code is using i (with an int). Using n (with the correct type, of course) might be strictly better even though it doesn't really matter, so I guess we'll stick with it.

Alphare accepted this revision.Aug 25 2021, 4:56 AM
This revision is now accepted and ready to land.Aug 25 2021, 4:56 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/revlog.c (3 lines)

Diff 30005

mercurial/cext/revlog.c

} }
/* 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, sidedata_comp_len; Py_ssize_t rev;
int sidedata_comp_len;
char comp_mode; char comp_mode;
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