[brlcad-commits] SF.net SVN: brlcad:[48089] brlcad/trunk/src/libbu/escape.c

[<br...@us...>]

Revision: 48089
          http://brlcad.svn.sourceforge.net/brlcad/?rev=48089&view=rev
Author:   brlcad
Date:     2011-12-20 23:39:22 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
don't call strlen() before we know whether input is NULL

Modified Paths:
--------------
    brlcad/trunk/src/libbu/escape.c

Modified: brlcad/trunk/src/libbu/escape.c
===================================================================
--- brlcad/trunk/src/libbu/escape.c	2011-12-20 23:17:11 UTC (rev 48088)
+++ brlcad/trunk/src/libbu/escape.c	2011-12-20 23:39:22 UTC (rev 48089)
@@ -31,7 +31,7 @@
     const char *c = NULL;
     const char *esc = NULL;
     char *incpy = NULL;
-    size_t need = strlen(input);
+    size_t need = 0;
     size_t i = 0;
 
     if (UNLIKELY(!input))
@@ -41,6 +41,7 @@
      * don't partially fill the output buffer before bombing because
      * there might be a bomb-hook registered (and it's faster).
      */
+    need = strlen(input);
     for (c = input; *c != '\0'; c++) {
 	for (esc = chars; *esc != '\0'; esc++) {
 	    if (*c == *esc) {
@@ -95,7 +96,7 @@
 {
     const char *c = NULL;
     char *incpy = NULL;
-    size_t need = strlen(input);
+    size_t need = 0;
     size_t i = 0;
 
     if (UNLIKELY(!input))
@@ -105,6 +106,7 @@
      * don't partially fill the output buffer before bombing because
      * there might be a bomb-hook registered (and it's faster).
      */
+    need = strlen(input);
     for (c = input; *c != '\0'; c++) {
 	if (*c == '\\') {
 	    /* skip the next char */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.