[BACK]Return to roff.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff.c between version 1.104 and 1.105

version 1.104, 2010/12/01 10:31:35 version 1.105, 2010/12/01 16:54:25
Line 62  enum rofft {
Line 62  enum rofft {
         ROFF_nh,          ROFF_nh,
         ROFF_nr,          ROFF_nr,
         ROFF_rm,          ROFF_rm,
           ROFF_so,
         ROFF_tr,          ROFF_tr,
         ROFF_cblock,          ROFF_cblock,
         ROFF_ccond, /* FIXME: remove this. */          ROFF_ccond, /* FIXME: remove this. */
Line 141  static int   roff_res(struct roff *, 
Line 142  static int   roff_res(struct roff *, 
                                 char **, size_t *, int);                                  char **, size_t *, int);
 static  void             roff_setstr(struct roff *,  static  void             roff_setstr(struct roff *,
                                 const char *, const char *);                                  const char *, const char *);
   static  enum rofferr     roff_so(ROFF_ARGS);
 static  char            *roff_strdup(const char *);  static  char            *roff_strdup(const char *);
   
 /* See roff_hash_find() */  /* See roff_hash_find() */
Line 169  static struct roffmac  roffs[ROFF_MAX] = {
Line 171  static struct roffmac  roffs[ROFF_MAX] = {
         { "nh", roff_line_ignore, NULL, NULL, 0, NULL },          { "nh", roff_line_ignore, NULL, NULL, 0, NULL },
         { "nr", roff_nr, NULL, NULL, 0, NULL },          { "nr", roff_nr, NULL, NULL, 0, NULL },
         { "rm", roff_line_error, NULL, NULL, 0, NULL },          { "rm", roff_line_error, NULL, NULL, 0, NULL },
           { "so", roff_so, NULL, NULL, 0, NULL },
         { "tr", roff_line_ignore, NULL, NULL, 0, NULL },          { "tr", roff_line_ignore, NULL, NULL, 0, NULL },
         { ".", roff_cblock, NULL, NULL, 0, NULL },          { ".", roff_cblock, NULL, NULL, 0, NULL },
         { "\\}", roff_ccond, NULL, NULL, 0, NULL },          { "\\}", roff_ccond, NULL, NULL, 0, NULL },
Line 1054  roff_nr(ROFF_ARGS)
Line 1057  roff_nr(ROFF_ARGS)
         return(ROFF_IGN);          return(ROFF_IGN);
 }  }
   
   /* ARGSUSED */
   static enum rofferr
   roff_so(ROFF_ARGS)
   {
           char *name;
   
           (*r->msg)(MANDOCERR_SO, r->data, ln, ppos, NULL);
   
           /*
            * Handle `so'.  Be EXTREMELY careful, as we shouldn't be
            * opening anything that's not in our cwd or anything beneath
            * it.  Thus, explicitly disallow traversing up the file-system
            * or using absolute paths.
            */
   
           name = *bufp + pos;
           if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) {
                   (*r->msg)(MANDOCERR_SOPATH, r->data, ln, pos, NULL);
                   return(ROFF_ERR);
           }
   
           *offs = pos;
           return(ROFF_SO);
   }
   
 static char *  static char *
 roff_strdup(const char *name)  roff_strdup(const char *name)

Legend:
Removed from v.1.104  
changed lines
  Added in v.1.105

CVSweb