This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3538

bdiff: fix yet more fallout from xdiff long/int64 conversion (issue5885)
ClosedPublic

Authored by jcristau on May 12 2018, 4:41 PM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHG273ea09f6550: bdiff: fix yet more fallout from xdiff long/int64 conversion (issue5885)
Summary

"l" in Py_BuildValue's format string means long, so passing int64_t
instead results in fireworks on 32bit architectures.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

jcristau created this revision.May 12 2018, 4:41 PM
durin42 accepted this revision.May 13 2018, 6:30 PM
This revision is now accepted and ready to land.May 13 2018, 6:30 PM
durin42 added a comment.May 13 2018, 6:30 PM

queued for stable, many thanks

Closed by commit rHG273ea09f6550: bdiff: fix yet more fallout from xdiff long/int64 conversion (issue5885) (authored by jcristau). · Explain WhyMay 13 2018, 6:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/bdiff.c (2 lines)

Diff 8658

mercurial/cext/bdiff.c

Py_XDECREF(result); Py_XDECREF(result);
return NULL; return NULL;
} }
static int hunk_consumer(int64_t a1, int64_t a2, int64_t b1, int64_t b2, static int hunk_consumer(int64_t a1, int64_t a2, int64_t b1, int64_t b2,
void *priv) void *priv)
{ {
PyObject *rl = (PyObject *)priv; PyObject *rl = (PyObject *)priv;
PyObject *m = Py_BuildValue("llll", a1, a2, b1, b2); PyObject *m = Py_BuildValue("LLLL", a1, a2, b1, b2);
if (!m) if (!m)
return -1; return -1;
if (PyList_Append(rl, m) != 0) { if (PyList_Append(rl, m) != 0) {
Py_DECREF(m); Py_DECREF(m);
return -1; return -1;
} }
return 0; return 0;
} }