Skip to content

Surface, Draw, and Transform segfault fixes #1940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ankith26 merged 15 commits into from
Mar 4, 2023
Merged

Surface, Draw, and Transform segfault fixes #1940

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8996fdd
fixed lots of potential segfaults
oddbookworm Jan 22, 2023
f99d8b8
fixed name clashes
oddbookworm Jan 22, 2023
152b897
ran formatter
oddbookworm Jan 22, 2023
0cd00af
Merge branch 'pygame:main' into draw_rect_segfault
oddbookworm Jan 22, 2023
346dd95
fixed draw and transform -- because I hadn't yet fixed them
oddbookworm Jan 22, 2023
6fa2119
Merge branch 'pygame:main' into draw_rect_segfault
oddbookworm Feb 7, 2023
fa5032b
Merge branch 'pygame-community:main' into bunch_of_segfaults
oddbookworm Feb 25, 2023
a2c9923
added macro for surface init test and spammed surface inits
oddbookworm Feb 25, 2023
c7c3f22
ran formatter
oddbookworm Feb 25, 2023
672fc55
fixed typo
oddbookworm Feb 25, 2023
448a498
ran formatter for one misaligned backslash
oddbookworm Feb 25, 2023
58e503e
changed arg of macro to be surf
oddbookworm Mar 2, 2023
d1a982c
fixed a broken condition and moved some checks around
oddbookworm Mar 3, 2023
0610ff2
maybe fixed uninitialized variable error
oddbookworm Mar 3, 2023
68886aa
remove doubled line
MyreMylar Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src_c/draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ aaline(PyObject *self, PyObject *arg, PyObject *kwargs)
return NULL; /* Exception already set. */
}

surf = pgSurface_AsSurface(surfobj);
SURF_INIT_CHECK(surf)

if (!blend) {
if (PyErr_WarnEx(
PyExc_DeprecationWarning,
Expand All @@ -128,8 +131,6 @@ aaline(PyObject *self, PyObject *arg, PyObject *kwargs)
}
}

surf = pgSurface_AsSurface(surfobj);

if (surf->format->BytesPerPixel <= 0 || surf->format->BytesPerPixel > 4) {
return PyErr_Format(PyExc_ValueError,
"unsupported surface bit depth (%d) for drawing",
Expand Down Expand Up @@ -191,6 +192,7 @@ line(PyObject *self, PyObject *arg, PyObject *kwargs)
}

surf = pgSurface_AsSurface(surfobj);
SURF_INIT_CHECK(surf)

if (surf->format->BytesPerPixel <= 0 || surf->format->BytesPerPixel > 4) {
return PyErr_Format(PyExc_ValueError,
Expand Down Expand Up @@ -265,6 +267,7 @@ aalines(PyObject *self, PyObject *arg, PyObject *kwargs)
}

surf = pgSurface_AsSurface(surfobj);
SURF_INIT_CHECK(surf)

if (surf->format->BytesPerPixel <= 0 || surf->format->BytesPerPixel > 4) {
return PyErr_Format(PyExc_ValueError,
Expand Down Expand Up @@ -398,6 +401,7 @@ lines(PyObject *self, PyObject *arg, PyObject *kwargs)
}

surf = pgSurface_AsSurface(surfobj);
SURF_INIT_CHECK(surf)

if (surf->format->BytesPerPixel <= 0 || surf->format->BytesPerPixel > 4) {
return PyErr_Format(PyExc_ValueError,
Expand Down Expand Up @@ -520,6 +524,7 @@ arc(PyObject *self, PyObject *arg, PyObject *kwargs)
}

surf = pgSurface_AsSurface(surfobj);
SURF_INIT_CHECK(surf)

if (surf->format->BytesPerPixel <= 0 || surf->format->BytesPerPixel > 4) {
return PyErr_Format(PyExc_ValueError,
Expand Down Expand Up @@ -595,6 +600,7 @@ ellipse(PyObject *self, PyObject *arg, PyObject *kwargs)
}

surf = pgSurface_AsSurface(surfobj);
SURF_INIT_CHECK(surf)

if (surf->format->BytesPerPixel <= 0 || surf->format->BytesPerPixel > 4) {
return PyErr_Format(PyExc_ValueError,
Expand Down Expand Up @@ -678,6 +684,7 @@ circle(PyObject *self, PyObject *args, PyObject *kwargs)
}

surf = pgSurface_AsSurface(surfobj);
SURF_INIT_CHECK(surf)

if (surf->format->BytesPerPixel <= 0 || surf->format->BytesPerPixel > 4) {
return PyErr_Format(PyExc_ValueError,
Expand Down Expand Up @@ -767,6 +774,7 @@ polygon(PyObject *self, PyObject *arg, PyObject *kwargs)
}

surf = pgSurface_AsSurface(surfobj);
SURF_INIT_CHECK(surf)

if (surf->format->BytesPerPixel <= 0 || surf->format->BytesPerPixel > 4) {
return PyErr_Format(PyExc_ValueError,
Expand Down Expand Up @@ -884,6 +892,8 @@ rect(PyObject *self, PyObject *args, PyObject *kwargs)
}

surf = pgSurface_AsSurface(surfobj);
SURF_INIT_CHECK(surf)

if (surf->format->BytesPerPixel <= 0 || surf->format->BytesPerPixel > 4) {
return PyErr_Format(PyExc_ValueError,
"unsupported surface bit depth (%d) for drawing",
Expand Down
7 changes: 7 additions & 0 deletions src_c/include/_pygame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,13 @@ PYGAMEAPI_EXTERN_SLOTS(math);
* functions in Python 3.
*/

#define SURF_INIT_CHECK(SDL_SurfObj) \
{ \
if (!SDL_SurfObj) { \
return RAISE(pgExc_SDLError, "Surface is not initialized"); \
} \
}

static PG_INLINE PyObject *
pg_tuple_couple_from_values_int(int val1, int val2)
{
Expand Down
Loading