Changeset 608


Ignore:
Timestamp:
Jul 17, 2006 11:24:45 AM (18 years ago)
Author:
bennylp
Message:

Bug fix of previous bug fix

Location:
pjproject/trunk/pjsip
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/include/pjsip/sip_parser.h

    r606 r608  
    313313    pjsip_ALNUM_SPEC,           /**< Decimal + Alpha. */ 
    314314    pjsip_TOKEN_SPEC,           /**< Token. */ 
     315    pjsip_TOKEN_SPEC_ESC,       /**< Token without '%' character */ 
    315316    pjsip_HEX_SPEC,             /**< Hexadecimal digits. */ 
    316317    pjsip_PARAM_CHAR_SPEC,      /**< For scanning pname (or pvalue when it's  
  • pjproject/trunk/pjsip/src/pjsip/sip_parser.c

    r606 r608  
    113113            pjsip_ALNUM_SPEC,           /* Decimal + Alpha. */ 
    114114            pjsip_TOKEN_SPEC,           /* Token. */ 
     115            pjsip_TOKEN_SPEC_ESC,       /* Token without '%' character */ 
    115116            pjsip_HEX_SPEC,             /* Hexadecimal digits. */ 
    116117            pjsip_PARAM_CHAR_SPEC,      /* For scanning pname (or pvalue when 
     
    329330    pj_cis_add_str( &pjsip_TOKEN_SPEC, TOKEN); 
    330331 
    331     /* TOKEN must not have '%' */ 
    332     pj_assert(pj_cis_match(&pjsip_TOKEN_SPEC, '%')==0); 
     332    status = pj_cis_dup(&pjsip_TOKEN_SPEC_ESC, &pjsip_TOKEN_SPEC); 
     333    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); 
     334    pj_cis_del_str(&pjsip_TOKEN_SPEC_ESC, "%"); 
    333335 
    334336    status = pj_cis_dup(&pjsip_HOST_SPEC, &pjsip_ALNUM_SPEC); 
     
    10841086{ 
    10851087    parse_param_imp(scanner, pool, pname, pvalue, &pjsip_TOKEN_SPEC, 
    1086                     &pjsip_TOKEN_SPEC, option); 
     1088                    &pjsip_TOKEN_SPEC_ESC, option); 
    10871089} 
    10881090 
Note: See TracChangeset for help on using the changeset viewer.