Merge branch 'main' of https://github.com/pygame-community/pygame-ce into window-create-context

Author: oddbookworm

buildconfig/download_win_prebuilt.py

@@ -82,8 +82,8 @@ def get_urls(x86=True, x64=True):
         '7469e9ea44d30a48b0510328cd94b25596e0aa0f',
         ],
         [
-        'https://github.com/pygame-community/SDL_image/releases/download/2.8.0-pgce/SDL2_image-devel-2.8.0-VCpgce.zip',
-        'da6b6a18f1c53baa775394e769059404925e98d7'
+        'https://github.com/pygame-community/SDL_image/releases/download/2.8.2-pgce/SDL2_image-devel-2.8.2-VCpgce.zip',
+        '983484dd816abf25cdd5bce88ac69dbca1ea713a'
         ],
         [
         'https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.20.2/SDL2_ttf-devel-2.20.2-VC.zip',
@@ -201,12 +201,12 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2_image-devel-2.8.0-VCpgce/SDL2_image-2.8.0'
+                'SDL2_image-devel-2.8.2-VCpgce/SDL2_image-2.8.2'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2_image-2.8.0'
+                'SDL2_image-2.8.2'
             )
         )
         copy(

buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh

@@ -4,7 +4,7 @@ set -e -x
 cd $(dirname `readlink -f "$0"`)
 
 SDL2="SDL2-2.28.5"
-IMG2="SDL2_image-2.8.0"
+IMG2="SDL2_image-2.8.2"
 TTF2="SDL2_ttf-2.20.2"
 MIX2="SDL2_mixer-2.6.3"
 

buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512

@@ -1,4 +1,4 @@
 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d  SDL2-2.28.5.tar.gz
-b58eb45e5d80a4467ca58672dd74ccf99cc84b9546ad5a3b6fca8caa4cd81351e611eef8aa98e5592f21d326358afe120a9b89e747274d7efa5f5e2c39504ff6  SDL2_image-2.8.0.tar.gz
+0ff345824f95158dfa72f83f9d4a540601c178cd759334bf849c14a2920b5330d0763413b58c08b3deba8d3a4ccb6ea2a8159f87efe4cbb0e8ea850f63d09454  SDL2_image-2.8.2.tar.gz
 2e9da045d2fdab97236c3901b3d441834a67a47c8851ddfb817c9db6f23ed9fb355a5ef8d2158d0c9959a83934e8cd1b95db8a69eaddf8f7fcca115f01818740  SDL2_mixer-2.6.3.tar.gz
 b54e93b100712e3764cd80d4e4b16cd4c2a6853620f675941a4214320b0ee29a583d57ad56cd5fdb5c7a32d7615cbf43bc3fa55337b01623cee7219ebb43667c  SDL2_ttf-2.20.2.tar.gz

src_c/surface.c

@@ -2145,6 +2145,7 @@ surf_fblits(pgSurfaceObject *self, PyObject *const *args, Py_ssize_t nargs)
     PyObject *blit_sequence, *item, *src_surf, *blit_pos;
     int blend_flags = 0; /* Default flag is 0, opaque */
     int error = 0;
+    int is_generator = 0;
 
     if (nargs == 0 || nargs > 2) {
         error = FBLITS_ERR_INCORRECT_ARGS_NUM;
@@ -2216,11 +2217,11 @@ surf_fblits(pgSurfaceObject *self, PyObject *const *args, Py_ssize_t nargs)
     }
     /* Generator path */
     else if (PyIter_Check(blit_sequence)) {
+        is_generator = 1;
         while ((item = PyIter_Next(blit_sequence))) {
             /* Check that the item is a tuple of length 2 */
             if (!PyTuple_Check(item) || PyTuple_GET_SIZE(item) != 2) {
                 error = FBLITS_ERR_TUPLE_REQUIRED;
-                Py_DECREF(item);
                 goto on_error;
             }
 
@@ -2229,8 +2230,6 @@ surf_fblits(pgSurfaceObject *self, PyObject *const *args, Py_ssize_t nargs)
             src_surf = PyTuple_GET_ITEM(item, 0);
             blit_pos = PyTuple_GET_ITEM(item, 1);
 
-            Py_DECREF(item);
-
             /* Check that the source is a Surface */
             if (!pgSurface_Check(src_surf)) {
                 error = BLITS_ERR_SOURCE_NOT_SURFACE;
@@ -2262,6 +2261,8 @@ surf_fblits(pgSurfaceObject *self, PyObject *const *args, Py_ssize_t nargs)
                 error = BLITS_ERR_BLIT_FAIL;
                 goto on_error;
             }
+
+            Py_DECREF(item);
         }
     }
     else {
@@ -2272,6 +2273,9 @@ surf_fblits(pgSurfaceObject *self, PyObject *const *args, Py_ssize_t nargs)
     Py_RETURN_NONE;
 
 on_error:
+    if (is_generator) {
+        Py_XDECREF(item);
+    }
     switch (error) {
         case BLITS_ERR_SEQUENCE_REQUIRED:
             return RAISE(

test/blit_test.py

@@ -163,6 +163,9 @@ def blits(blit_list):
         self.assertEqual(dst.fblits(blit_list, 0), None)
         self.assertEqual(dst.fblits(blit_list, 1), dst.blits(blit_list, doreturn=0))
 
+        # make sure this doesn't segfault
+        dst.fblits((dst, dst.get_rect().topleft) for _ in range(1))
+
         t0 = time()
         results = blits(blit_list)
         t1 = time()