This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3554

xdiff: fix Py_BuildValue types (issue5885)
AbandonedPublic

Authored by quark on May 13 2018, 2:48 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Julien Cristau reported and provided the fix [1]. I added an assertion.

Note Python documentation (2.7 to 3.5) says "L" in Py_BuildValue might be
unsupported on some platforms:

L (int) [PY_LONG_LONG]
Convert a Python integer to a C long long. This format is only available
on platforms that support long long (or _int64 on Windows).

But it is required to build Python 2.7 itself [2]. So using it won't affect
supported platforms.

[1]: https://bz.mercurial-scm.org/show_bug.cgi?id=5885#c3
[2]: https://bugs.python.org/issue27961

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.May 13 2018, 2:48 PM
quark abandoned this revision.May 13 2018, 2:52 PM

Duplicated with D3538.

Revision Contents
Changeset List

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

Diff 8676

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); Py_BUILD_ASSERT(sizeof(a1) == sizeof(PY_LONG_LONG));
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;
} }