@@ -1274,7 +1274,7 @@ static void GzipReader_dealloc(GzipReader *self)
1274
1274
static PyObject *
1275
1275
GzipReader__new__ (PyTypeObject * type , PyObject * args , PyObject * kwargs )
1276
1276
{
1277
- PyObject * fp ;
1277
+ PyObject * fp = NULL ;
1278
1278
Py_ssize_t buffer_size = 32 * 1024 ;
1279
1279
static char * keywords [] = {"fp" , "buffersize" , NULL };
1280
1280
static char * format = "O|n:GzipReader" ;
@@ -1387,7 +1387,7 @@ GzipReader_read_into_buffer(GzipReader *self, uint8_t *out_buffer, size_t out_bu
1387
1387
while (1 ) {
1388
1388
uint8_t * current_pos = self -> current_pos ;
1389
1389
uint8_t * buffer_end = self -> buffer_end ;
1390
- switch (self -> stream_phase ) {
1390
+ switch (self -> stream_phase ) {
1391
1391
case GzipReader_HEADER :
1392
1392
GzipReader_read_header :
1393
1393
size_t remaining = buffer_end - current_pos ;
@@ -1563,7 +1563,9 @@ GzipReader_readinto(GzipReader *self, PyObject *buffer_obj)
1563
1563
}
1564
1564
uint8_t * buffer = view .buf ;
1565
1565
size_t buffer_size = Py_MIN (view .len , UINT32_MAX );
1566
+ ENTER_ZLIB (self );
1566
1567
ssize_t written_size = GzipReader_read_into_buffer (self , buffer , buffer_size );
1568
+ LEAVE_ZLIB (self );
1567
1569
PyBuffer_Release (& view );
1568
1570
if (written_size < 0 ) {
1569
1571
return NULL ;
@@ -1668,8 +1670,10 @@ GzipReader_readall(GzipReader *self, PyObject *Py_UNUSED(ignore))
1668
1670
if (first_chunk == NULL ) {
1669
1671
return NULL ;
1670
1672
}
1673
+ ENTER_ZLIB (self );
1671
1674
ssize_t written_size = GzipReader_read_into_buffer (
1672
1675
self , (uint8_t * )PyBytes_AS_STRING (first_chunk ), chunk_size );
1676
+ LEAVE_ZLIB (self );
1673
1677
if (written_size < 0 ) {
1674
1678
Py_DECREF (first_chunk );
1675
1679
return NULL ;
@@ -1692,8 +1696,10 @@ GzipReader_readall(GzipReader *self, PyObject *Py_UNUSED(ignore))
1692
1696
Py_DECREF (chunk_list );
1693
1697
return NULL ;
1694
1698
}
1699
+ ENTER_ZLIB (self );
1695
1700
written_size = GzipReader_read_into_buffer (
1696
1701
self , (uint8_t * )PyBytes_AS_STRING (chunk ), chunk_size );
1702
+ LEAVE_ZLIB (self );
1697
1703
if (written_size < 0 ) {
1698
1704
Py_DECREF (chunk );
1699
1705
Py_DECREF (chunk_list );
@@ -1740,7 +1746,9 @@ GzipReader_read(GzipReader *self, PyObject *args)
1740
1746
if (answer == NULL ) {
1741
1747
return NULL ;
1742
1748
}
1749
+ ENTER_ZLIB (self );
1743
1750
ssize_t written_bytes = GzipReader_read_into_buffer (self , (uint8_t * )PyBytes_AS_STRING (answer ), answer_size );
1751
+ LEAVE_ZLIB (self );
1744
1752
if (written_bytes < 0 ) {
1745
1753
Py_DECREF (answer );
1746
1754
return NULL ;
0 commit comments