Skip to content

Commit 2b447c7

Browse files
committed
use PyUnicode_FromStringAndSize in PySTRING_FROM_AMQBYTES macro.
This commit fixes crashes when librabbitmq is used in kombu.
1 parent 039c946 commit 2b447c7

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Modules/_librabbitmq/connection.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,14 @@ buffer_toMemoryView(char *buf, Py_ssize_t buf_len) {
8787
Py_XDECREF(value); \
8888
} while(0)
8989

90-
#define PySTRING_FROM_AMQBYTES(member) \
91-
PyBytes_FromStringAndSize(member.bytes, (Py_ssize_t)member.len); \
90+
#if PY_MAJOR_VERSION == 2
91+
# define PySTRING_FROM_AMQBYTES(member) \
92+
PyString_FromStringAndSize(member.bytes, (Py_ssize_t)member.len);
93+
#else
94+
# define PySTRING_FROM_AMQBYTES(member) \
95+
PyUnicode_FromStringAndSize(member.bytes, (Py_ssize_t)member.len);
96+
#endif
97+
9298

9399
#define AMQTable_TO_PYKEY(table, i) \
94100
PySTRING_FROM_AMQBYTES(table->entries[i].key)

0 commit comments

Comments
 (0)