Merge pull request #2606 from pygame-community/ankith26-rwops-free

Fix file-like `close` not called in freetype (Removed `pgRWops_ReleaseObject` and replaced usage with `SDL_RWclose`)

Author: zoldalma999

docs/reST/c_api/rwobject.rst

@@ -41,12 +41,6 @@ Header file: src_c/include/pygame.h
    Return true if *rw* is a Python file-like object wrapper returned by :c:func:`pgRWops_FromObject`
    or :c:func:`pgRWops_FromFileObject`.
 
-.. c:function:: int pgRWops_ReleaseObject(SDL_RWops *context)
-
-   Free a SDL_RWops struct. If it is attached to a Python file-like object, decrement its
-   refcount. Otherwise, close the file handle.
-   Return 0 on success. On error, raise a Python exception and return a negative value.
-
 .. c:function:: PyObject* pg_EncodeFilePath(PyObject *obj, PyObject *eclass)
 
    Return the file path *obj* as a byte string properly encoded for the OS.

src_c/_freetype.c

@@ -678,7 +678,7 @@ _ftfont_dealloc(pgFontObject *self)
     SDL_RWops *src = _PGFT_GetRWops(self);
     _PGFT_UnloadFont(self->freetype, self);
     if (src) {
-        pgRWops_ReleaseObject(src);
+        SDL_RWclose(src);
     }
     _PGFT_Quit(self->freetype);
 

src_c/_pygame.h

@@ -481,7 +481,7 @@ typedef enum {
 #define PYGAMEAPI_DISPLAY_NUMSLOTS 2
 #define PYGAMEAPI_SURFACE_NUMSLOTS 4
 #define PYGAMEAPI_SURFLOCK_NUMSLOTS 8
-#define PYGAMEAPI_RWOBJECT_NUMSLOTS 6
+#define PYGAMEAPI_RWOBJECT_NUMSLOTS 5
 #define PYGAMEAPI_PIXELARRAY_NUMSLOTS 2
 #define PYGAMEAPI_COLOR_NUMSLOTS 5
 #define PYGAMEAPI_MATH_NUMSLOTS 2

src_c/include/_pygame.h

@@ -423,9 +423,6 @@ typedef struct pgEventObject pgEventObject;
 #define pgRWops_FromFileObject \
     (*(SDL_RWops * (*)(PyObject *)) PYGAMEAPI_GET_SLOT(rwobject, 4))
 
-#define pgRWops_ReleaseObject \
-    (*(int (*)(SDL_RWops *))PYGAMEAPI_GET_SLOT(rwobject, 5))
-
 #define import_pygame_rwobject() IMPORT_PYGAME_MODULE(rwobject)
 
 #endif

src_c/rwobject.c

@@ -505,50 +505,6 @@ pgRWops_FromFileObject(PyObject *obj)
     return rw;
 }
 
-static int
-pgRWops_ReleaseObject(SDL_RWops *context)
-{
-    int ret = 0;
-    if (pgRWops_IsFileObject(context)) {
-#ifdef WITH_THREAD
-        PyGILState_STATE state = PyGILState_Ensure();
-#endif /* WITH_THREAD */
-
-        pgRWHelper *helper = (pgRWHelper *)context->hidden.unknown.data1;
-        PyObject *fileobj = helper->file;
-        /* 5 helper functions */
-        Py_ssize_t filerefcnt = Py_REFCNT(fileobj) - 1 - 5;
-
-        if (filerefcnt) {
-            Py_XDECREF(helper->seek);
-            Py_XDECREF(helper->tell);
-            Py_XDECREF(helper->write);
-            Py_XDECREF(helper->read);
-            Py_XDECREF(helper->close);
-            Py_DECREF(fileobj);
-            PyMem_Free(helper);
-            SDL_FreeRW(context);
-        }
-        else {
-            ret = SDL_RWclose(context);
-            if (ret < 0) {
-                PyErr_SetString(PyExc_IOError, SDL_GetError());
-                Py_DECREF(fileobj);
-            }
-        }
-
-#ifdef WITH_THREAD
-        PyGILState_Release(state);
-#endif /* WITH_THREAD */
-    }
-    else {
-        ret = SDL_RWclose(context);
-        if (ret < 0)
-            PyErr_SetString(PyExc_IOError, SDL_GetError());
-    }
-    return ret;
-}
-
 static Sint64
 _pg_rw_seek(SDL_RWops *context, Sint64 offset, int whence)
 {
@@ -894,7 +850,6 @@ MODINIT_DEFINE(rwobject)
     c_api[2] = pg_EncodeFilePath;
     c_api[3] = pg_EncodeString;
     c_api[4] = pgRWops_FromFileObject;
-    c_api[5] = pgRWops_ReleaseObject;
     apiobj = encapsulate_api(c_api, "rwobject");
     if (PyModule_AddObject(module, PYGAMEAPI_LOCAL_ENTRY, apiobj)) {
         Py_XDECREF(apiobj);

src_c/static.c

@@ -366,7 +366,6 @@ PyInit_pygame_static()
 #undef pgRWops_IsFileObject
 #undef pgRWops_GetFileExtension
 #undef pgRWops_FromFileObject
-#undef pgRWops_ReleaseObject
 #undef pgRWops_FromObject
 
 #include "rwobject.c"