]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
Fix potential bug with derefrencing a NULL pointer
authorDale Weiler <killfieldengine@gmail.com>
Tue, 17 Apr 2012 20:22:28 +0000 (16:22 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Tue, 17 Apr 2012 20:22:28 +0000 (16:22 -0400)
util.c

diff --git a/util.c b/util.c
index 6e044ac14c05c59ba7ebaa65bad1828f0e574dcd..44b1108595bdd3cc183ae9ad418064b72da31879 100644 (file)
--- a/util.c
+++ b/util.c
@@ -106,13 +106,14 @@ char *util_strrq(char *s) {
  * done pointer wise instead of strlen(), and an array
  * access.
  */
-char *util_strrnl(char *s) {
-       char  *cpy = s;
-       while (cpy && *cpy && *cpy != '\n')
+char *util_strrnl(char *src) {
+       if (!src) return NULL;
+       char   *cpy = src;
+       while (*cpy && *cpy != '\n')
                cpy++;
                
        *cpy = '\0';
-       return s;
+       return src;
 }
 
 void util_debug(const char *area, const char *ms, ...) {