cvs commit: apr-iconv/lib iconv_module.c

[brane]

brane       2003/02/12 15:39:19

  Modified:    lib      iconv_module.c
  Log:
  Silly me, getenv could easily return NULL, whereupon
  apr_filepath_list_split would bomb out.
  
  Revision  Changes    Path
  1.13      +3 -3      apr-iconv/lib/iconv_module.c
  
  Index: iconv_module.c
  ===================================================================
  RCS file: /home/cvs/apr-iconv/lib/iconv_module.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- iconv_module.c    12 Feb 2003 20:30:42 -0000      1.12
  +++ iconv_module.c    12 Feb 2003 23:39:19 -0000      1.13
  @@ -94,9 +94,9 @@
   
           /* FIXME: Should use apr_env_get instead, to get correct path
                     encoding on Windows. */
  -        status = apr_filepath_list_split(&pathelts, getenv("APR_ICONV_PATH"),
  -                                         subpool);
  -        if (!status)
  +        ptr = getenv("APR_ICONV_PATH");
  +        if (ptr != NULL
  +            && !apr_filepath_list_split(&pathelts, ptr, subpool))
           {
               int i;
               char **elts = (char **)pathelts->elts;