From 0fce1c9a53f02bb4ec3172cdf0fdd6e907aa87c7 Mon Sep 17 00:00:00 2001
From: Mario <mario@smbclan.net>
Date: Wed, 10 Oct 2018 20:48:52 +1000
Subject: [PATCH] Fix a potential crash in Weapons_fromstr (WEP_Null is
 expected, not NULL)

---
 qcsrc/common/weapons/all.qh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 9b4c0b4681..9a32b42778 100644
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -130,7 +130,7 @@ REGISTER_WEAPON(Null, NEW(Weapon));
 Weapon Weapons_fromstr(string s)
 {
     FOREACH(Weapons, it != WEP_Null && it.netname == s, return it);
-    return NULL;
+    return WEP_Null;
 }
 
 
-- 
2.39.5