Add NULL check

narilee2006 · narilee2006 · commit 88485eac66ed · 2024-05-03T18:43:54.000+09:00
diff --git a/src_c/font.c b/src_c/font.c
@@ -664,11 +664,11 @@ font_render(PyObject *self, PyObject *args, PyObject *kwds)
     }
 
     SDL_Color foreg = {rgba[0], rgba[1], rgba[2], SDL_ALPHA_OPAQUE};
-    SDL_Color backg;
+    SDL_Color backg = {0, 0, 0, SDL_ALPHA_OPAQUE};
     int draw_backg = 1;
     /* might be overridden right below, with an explicit background color */
 
-    if (bg_rgba_obj != NULL && bg_rgba_obj != Py_None) {
+    if (bg_rgba_obj != Py_None) {
         if (!pg_RGBAFromObjEx(bg_rgba_obj, rgba, PG_COLOR_HANDLE_ALL)) {
             return 0;  // exception already set.
         }

Original file line number	Diff line number	Diff line change
`@@ -664,11 +664,11 @@ font_render(PyObject self, PyObject args, PyObject *kwds)`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`SDL_Color foreg = {rgba[0], rgba[1], rgba[2], SDL_ALPHA_OPAQUE};`
`667`		`- SDL_Color backg;`
	`667`	`+ SDL_Color backg = {0, 0, 0, SDL_ALPHA_OPAQUE};`
`668`	`668`	`int draw_backg = 1;`
`669`	`669`	`/* might be overridden right below, with an explicit background color */`
`670`	`670`
`671`		`- if (bg_rgba_obj != NULL && bg_rgba_obj != Py_None) {`
	`671`	`+ if (bg_rgba_obj != Py_None) {`
`672`	`672`	`if (!pg_RGBAFromObjEx(bg_rgba_obj, rgba, PG_COLOR_HANDLE_ALL)) {`
`673`	`673`	`return 0; // exception already set.`
`674`	`674`	`}`