From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Thu, 3 Jul 2008 16:46:52 +0000 (+0000)
Subject:   * trim error if string is null
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cd210353ec64c2e597c75a20d65076e0ca33aa10;p=modchxj%2Fmod_chxj.git

  * trim error if string is null


git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_11_0@2787 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---

diff --git a/src/chxj_tag_util.c b/src/chxj_tag_util.c
index 195b08c6..655e1ee0 100644
--- a/src/chxj_tag_util.c
+++ b/src/chxj_tag_util.c
@@ -156,10 +156,15 @@ qs_alloc_zero_byte_string(request_rec* r)
 char*
 qs_trim_string(apr_pool_t *p, char* s)
 {
-  char* ss = apr_pstrdup(p, s);
-  int len = strlen(s);
+  char *ss;
+  int len;
   int ii;
 
+  if (! s) return apr_pstrdup(p, "");
+
+  len = strlen(s);
+  ss = apr_pstrdup(p, s);
+
   ii = 0;
   for (ii = 0;is_white_space(*ss) && ii < len; ss++, ii++);