[iortcw] 127/497: All: Fix an invalid null deref check in the slider code

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit f1e81bb85fe627869e50b97fed6e6f368fffe847
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Fri May 30 21:51:21 2014 +0000

    All: Fix an invalid null deref check in the slider code
---
 MP/code/ui/ui_shared.c | 2 +-
 SP/code/ui/ui_shared.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/ui/ui_shared.c b/MP/code/ui/ui_shared.c
index 5beca18..c90f841 100644
--- a/MP/code/ui/ui_shared.c
+++ b/MP/code/ui/ui_shared.c
@@ -1754,7 +1754,7 @@ float Item_Slider_ThumbPosition( itemDef_t *item ) {
 		x = item->window.rect.x;
 	}
 
-	if ( editDef == NULL && item->cvar ) {
+	if (!editDef || !item->cvar) {
 		return x;
 	}
 
diff --git a/SP/code/ui/ui_shared.c b/SP/code/ui/ui_shared.c
index db3ffff..1654e43 100644
--- a/SP/code/ui/ui_shared.c
+++ b/SP/code/ui/ui_shared.c
@@ -1750,7 +1750,7 @@ float Item_Slider_ThumbPosition( itemDef_t *item ) {
 		x = item->window.rect.x;
 	}
 
-	if ( editDef == NULL && item->cvar ) {
+	if (!editDef || !item->cvar) {
 		return x;
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git