Staging
v0.5.1
v0.5.1
https://github.com/python/cpython
Revision 25bfb1aa75c8358becdab11142954c8ee9c3607f authored by Miss Islington (bot) on 09 October 2018, 15:20:38 UTC, committed by GitHub on 09 October 2018, 15:20:38 UTC
When Python is built with the intel control-flow protection flags, -mcet -fcf-protection, gdb is not able to read the stack without actually jumping inside the function. This means an extra 'next' command is required to make the $pc (program counter) enter the function and make the stack of the function exposed to gdb. Co-Authored-By: Marcel Plch <gmarcel.plch@gmail.com> (cherry picked from commit 9b7c74ca32d1bec7128d550a9ab1b2ddc7046287) (cherry picked from commit 79d21331e605fdc941f947621846b8563485aab6) Co-authored-by: Victor Stinner <vstinner@redhat.com>
1 parent 64bcedc
Tip revision: 25bfb1aa75c8358becdab11142954c8ee9c3607f authored by Miss Islington (bot) on 09 October 2018, 15:20:38 UTC
bpo-32962: Fix test_gdb failure in debug build with -mcet -fcf-protection -O0 (GH-9656)
bpo-32962: Fix test_gdb failure in debug build with -mcet -fcf-protection -O0 (GH-9656)
Tip revision: 25bfb1a
pystrhex.c
/* bytes to hex implementation */
#include "Python.h"
static PyObject *_Py_strhex_impl(const char* argbuf, const Py_ssize_t arglen,
int return_bytes)
{
PyObject *retval;
Py_UCS1* retbuf;
Py_ssize_t i, j;
assert(arglen >= 0);
if (arglen > PY_SSIZE_T_MAX / 2)
return PyErr_NoMemory();
if (return_bytes) {
/* If _PyBytes_FromSize() were public we could avoid malloc+copy. */
retbuf = (Py_UCS1*) PyMem_Malloc(arglen*2);
if (!retbuf)
return PyErr_NoMemory();
retval = NULL; /* silence a compiler warning, assigned later. */
} else {
retval = PyUnicode_New(arglen*2, 127);
if (!retval)
return NULL;
retbuf = PyUnicode_1BYTE_DATA(retval);
}
/* make hex version of string, taken from shamodule.c */
for (i=j=0; i < arglen; i++) {
unsigned char c;
c = (argbuf[i] >> 4) & 0xf;
retbuf[j++] = Py_hexdigits[c];
c = argbuf[i] & 0xf;
retbuf[j++] = Py_hexdigits[c];
}
if (return_bytes) {
retval = PyBytes_FromStringAndSize((const char *)retbuf, arglen*2);
PyMem_Free(retbuf);
}
#ifdef Py_DEBUG
else {
assert(_PyUnicode_CheckConsistency(retval, 1));
}
#endif
return retval;
}
PyAPI_FUNC(PyObject *) _Py_strhex(const char* argbuf, const Py_ssize_t arglen)
{
return _Py_strhex_impl(argbuf, arglen, 0);
}
/* Same as above but returns a bytes() instead of str() to avoid the
* need to decode the str() when bytes are needed. */
PyAPI_FUNC(PyObject *) _Py_strhex_bytes(const char* argbuf, const Py_ssize_t arglen)
{
return _Py_strhex_impl(argbuf, arglen, 1);
}
Computing file changes ...