summaryrefslogtreecommitdiffstats
path: root/Modules/binascii.c
diff options
context:
space:
mode:
authorWalter Dörwald <walter@livinglogic.de>2007-05-09 18:23:50 (GMT)
committerWalter Dörwald <walter@livinglogic.de>2007-05-09 18:23:50 (GMT)
commit0925e419dfc5de666965dcd15ae08d045c7df36f (patch)
treeb7a2e5a1bedd993adc0d433dcfbb15edf7f45ebd /Modules/binascii.c
parent3699582e035ec08108b65ecda0bf043e4d56260f (diff)
downloadcpython-0925e419dfc5de666965dcd15ae08d045c7df36f.zip
cpython-0925e419dfc5de666965dcd15ae08d045c7df36f.tar.gz
cpython-0925e419dfc5de666965dcd15ae08d045c7df36f.tar.bz2
Forwardport checkin:
Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr() instead of memchr().
Diffstat (limited to 'Modules/binascii.c')
-rw-r--r--Modules/binascii.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/binascii.c b/Modules/binascii.c
index 91309f6..00f950d 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -1150,7 +1150,7 @@ binascii_b2a_qp (PyObject *self, PyObject *args, PyObject *kwargs)
/* XXX: this function has the side effect of converting all of
* the end of lines to be the same depending on this detection
* here */
- p = (unsigned char *) strchr((char *)data, '\n');
+ p = (unsigned char *) memchr(data, '\n', datalen);
if ((p != NULL) && (p > data) && (*(p-1) == '\r'))
crlf = 1;