From 2976ed8cd78b05aeafca8e79d1c6f97b3ca7371c Mon Sep 17 00:00:00 2001
From: MadCamel <madcamel@gmail.com>
Date: Thu, 27 Mar 2014 16:11:04 -0400
Subject: [PATCH] Crash fix: Strlen2 now checks for null pointers

---
 src/function.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/function.c b/src/function.c
index 3dab453..f8fa76d 100644
--- a/src/function.c
+++ b/src/function.c
@@ -204,8 +204,11 @@ int Strlen2(const char *one, const char *two)
 {
 	const char *s1,*s2;
 
-	for(s1=one;*s1;s1++);
-	for(s2=two;*s2;s2++);
+	if (one)
+		for(s1=one;*s1;s1++);
+	if (two)
+		for(s2=two;*s2;s2++);
+
 	return((s1 - one) + (s2 - two));
 }