Blame 0002-Check-the-correct-pointer-for-NULL.patch
|
 |
fd59d4f |
From 293cd0dabd9db6a57167ea88cd42f5f507e23156 Mon Sep 17 00:00:00 2001
|
|
|
fd59d4f |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
fd59d4f |
Date: Sat, 14 Nov 2015 16:47:38 +0100
|
|
|
fd59d4f |
Subject: [PATCH 2/7] Check the correct pointer for NULL
|
|
|
fd59d4f |
|
|
|
fd59d4f |
---
|
|
|
fd59d4f |
src/basecode/toolkit.cpp | 4 ++--
|
|
|
fd59d4f |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
fd59d4f |
|
|
|
fd59d4f |
diff --git a/src/basecode/toolkit.cpp b/src/basecode/toolkit.cpp
|
|
|
fd59d4f |
index 26c79d0..aa25363 100644
|
|
|
fd59d4f |
--- a/src/basecode/toolkit.cpp
|
|
|
fd59d4f |
+++ b/src/basecode/toolkit.cpp
|
|
|
fd59d4f |
@@ -407,8 +407,8 @@ SDL_Cursor *load_cursor(const char *aFilename, int hotx, int hoty)
|
|
|
fd59d4f |
SDL_Cursor *cursor;
|
|
|
fd59d4f |
int ix, iy, n;
|
|
|
fd59d4f |
unsigned char *imgdata = stbi_load(aFilename, &ix, &iy, &n, 4);
|
|
|
fd59d4f |
-
|
|
|
fd59d4f |
- if (data == NULL)
|
|
|
fd59d4f |
+
|
|
|
fd59d4f |
+ if (imgdata == NULL)
|
|
|
fd59d4f |
return NULL;
|
|
|
fd59d4f |
|
|
|
fd59d4f |
if (ix > 32 || iy > 32)
|
|
|
fd59d4f |
--
|
|
|
fd59d4f |
2.5.0
|
|
|
fd59d4f |
|