This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4840

cext: use modern buffer protocol in patches()
ClosedPublic

Authored by indygreg on Oct 2 2018, 4:14 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG77492c10a35b: cext: use modern buffer protocol in patches()
Summary

PyObject_AsCharBuffer() is part of the "Old Buffer Protocol," which
has been deprecated for years. Let's port away from it.

PyBuffer_GetBuffer() must be paired with PyBuffer_Release(), hence the
added "goto cleanup" in a failure case.

We don't bump the extension version because the API has not changed.

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

indygreg created this revision.Oct 2 2018, 4:14 PM
Closed by commit rHG77492c10a35b: cext: use modern buffer protocol in patches() (authored by indygreg). · Explain WhyOct 3 2018, 8:29 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/mpatch.c (15 lines)

Diff 11597

mercurial/cext/mpatch.c

} }
return res; return res;
} }
static PyObject *patches(PyObject *self, PyObject *args) static PyObject *patches(PyObject *self, PyObject *args)
{ {
PyObject *text, *bins, *result; PyObject *text, *bins, *result;
struct mpatch_flist *patch; struct mpatch_flist *patch;
const char *in; Py_buffer buffer;
int r = 0; int r = 0;
char *out; char *out;
Py_ssize_t len, outlen, inlen; Py_ssize_t len, outlen;
if (!PyArg_ParseTuple(args, "OO:mpatch", &text, &bins)) if (!PyArg_ParseTuple(args, "OO:mpatch", &text, &bins))
return NULL; return NULL;
len = PyList_Size(bins); len = PyList_Size(bins);
if (!len) { if (!len) {
/* nothing to do */ /* nothing to do */
Py_INCREF(text); Py_INCREF(text);
return text; return text;
} }
if (PyObject_AsCharBuffer(text, &in, &inlen)) if (PyObject_GetBuffer(text, &buffer, PyBUF_CONTIG_RO)) {
return NULL; return NULL;
}
patch = mpatch_fold(bins, cpygetitem, 0, len); patch = mpatch_fold(bins, cpygetitem, 0, len);
if (!patch) { /* error already set or memory error */ if (!patch) { /* error already set or memory error */
if (!PyErr_Occurred()) if (!PyErr_Occurred())
PyErr_NoMemory(); PyErr_NoMemory();
return NULL; result = NULL;
goto cleanup;
} }
outlen = mpatch_calcsize(inlen, patch); outlen = mpatch_calcsize(buffer.len, patch);
if (outlen < 0) { if (outlen < 0) {
r = (int)outlen; r = (int)outlen;
result = NULL; result = NULL;
goto cleanup; goto cleanup;
} }
result = PyBytes_FromStringAndSize(NULL, outlen); result = PyBytes_FromStringAndSize(NULL, outlen);
if (!result) { if (!result) {
result = NULL; result = NULL;
goto cleanup; goto cleanup;
} }
out = PyBytes_AsString(result); out = PyBytes_AsString(result);
/* clang-format off */ /* clang-format off */
{ {
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
r = mpatch_apply(out, in, inlen, patch); r = mpatch_apply(out, buffer.buf, buffer.len, patch);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
} }
/* clang-format on */ /* clang-format on */
if (r < 0) { if (r < 0) {
Py_DECREF(result); Py_DECREF(result);
result = NULL; result = NULL;
} }
cleanup: cleanup:
mpatch_lfree(patch); mpatch_lfree(patch);
PyBuffer_Release(&buffer);
if (!result && !PyErr_Occurred()) if (!result && !PyErr_Occurred())
setpyerr(r); setpyerr(r);
return result; return result;
} }
/* calculate size of a patched file directly */ /* calculate size of a patched file directly */
static PyObject *patchedsize(PyObject *self, PyObject *args) static PyObject *patchedsize(PyObject *self, PyObject *args)
{ {