fix: null dereference

frutiemax92 · Aug 20, 2023 · f9d950f · f9d950f
1 parent fcb0cf8
commit f9d950f
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/new_subscr.cpp b/src/new_subscr.cpp
@@ -3181,16 +3181,14 @@ int32_t SubscrPage::move_legacy(int dir, int startp, int fp, int fp2, int fp3, b
 
 	if(verify)
 	{
-		SubscrWidget* widg = get_widg_pos(startp);
-		int32_t wpn = widg ? widg->getItemVal() : -1;
 		equip_only = item_only = true;
-		if(widg->getType() != widgITEMSLOT || (widg->flags&SUBSCR_CURITM_NONEQP))
-			wpn = -1;
-
-		if(wpn > 0 && startp != fp && startp != fp2 && startp != fp3)
-		{
-			return startp;
-		}
+		if(startp != fp && startp != fp2 && startp != fp3)
+			if(SubscrWidget* widg = get_widg_pos(startp))
+			{
+				if(widg->getType() == widgITEMSLOT && !(widg->flags&SUBSCR_CURITM_NONEQP)
+					&& widg->getItemVal() > 0)
+					return startp;
+			}
 	}
 
 	int32_t p=-1;