[BACK]Return to chars.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / mandoc

Diff for /src/usr.bin/mandoc/chars.c between version 1.29 and 1.30

version 1.29, 2014/07/23 15:00:00 version 1.30, 2014/10/26 17:11:18
Line 1 
Line 1 
 /*      $Id$ */  /*      $OpenBSD$ */
 /*  /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2011, 2014 Ingo Schwarze <schwarze@openbsd.org>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 100 
Line 100 
         const struct ln *ln;          const struct ln *ln;
   
         ln = find(arg, p, sz);          ln = find(arg, p, sz);
         if (NULL == ln)          return(ln != NULL ? ln->unicode : sz == 1 ? *p : -1);
                 return(-1);  
         return(ln->unicode);  
 }  }
   
 char  char
Line 122 
Line 120 
         int      i;          int      i;
   
         if ((i = mandoc_strntoi(p, sz, 16)) < 0)          if ((i = mandoc_strntoi(p, sz, 16)) < 0)
                 return('\0');                  return(0xFFFD);
   
         /*          /*
          * Security warning:  
          * Never extend the range of accepted characters  
          * to overlap with the ASCII range, 0x00-0x7F  
          * without re-auditing the callers of this function.  
          * Some callers might relay on the fact that we never  
          * return ASCII characters for their escaping decisions.  
          *  
          * XXX Code is missing here to exclude bogus ranges.           * XXX Code is missing here to exclude bogus ranges.
          */           */
   
         return(i > 0x80 && i <= 0x10FFFF ? i : '\0');          return(i <= 0x10FFFF ? i : 0xFFFD);
 }  }
   
 const char *  const char *
Line 145 
Line 136 
         const struct ln *ln;          const struct ln *ln;
   
         ln = find(arg, p, sz);          ln = find(arg, p, sz);
         if (NULL == ln) {          if (ln == NULL) {
                 *rsz = 1;                  *rsz = 1;
                 return(NULL);                  return(sz == 1 ? p : NULL);
         }          }
   
         *rsz = strlen(ln->ascii);          *rsz = strlen(ln->ascii);
Legend:
Removed from v.1.29  
changed lines
  Added in v.1.30