Changeset 4375


Ignore:
Timestamp:
Feb 27, 2013 9:28:31 AM (11 years ago)
Author:
ming
Message:

Re #1558: backported r4209,r4210 to 1.x

Location:
pjproject/branches/1.x
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x

  • pjproject/branches/1.x/pjlib-util/src/pjlib-util/scanner.c

    r3553 r4375  
    394394                    /* break from main loop if we have odd number of backslashes */ 
    395395                    if (((unsigned)(q-r) & 0x01) == 1) { 
    396                         ++s; 
    397396                        break; 
    398397                    } 
  • pjproject/branches/1.x/pjsip/src/test/uri_test.c

    r3553 r4375  
    6868static pjsip_uri *create_uri16( pj_pool_t *pool ); 
    6969static pjsip_uri *create_uri17( pj_pool_t *pool ); 
     70static pjsip_uri *create_uri18( pj_pool_t *pool ); 
    7071static pjsip_uri *create_uri25( pj_pool_t *pool ); 
    7172static pjsip_uri *create_uri26( pj_pool_t *pool ); 
     
    8283static pjsip_uri *create_uri37( pj_pool_t *pool ); 
    8384static pjsip_uri *create_uri38( pj_pool_t *pool ); 
     85static pjsip_uri *create_uri39( pj_pool_t *pool ); 
    8486static pjsip_uri *create_dummy( pj_pool_t *pool ); 
    8587 
     
    350352        &create_uri38, 
    351353        "\"\xC0\x81\" <sip:localhost>" 
     354    }, 
     355    { 
     356        /* Even number of backslash before end quote in display name. */ 
     357        PJ_SUCCESS, 
     358        "\"User\\\\\" <sip:localhost>", 
     359        &create_uri39, 
    352360    } 
    353361 
     
    758766    return (pjsip_uri*)name; 
    759767 
     768} 
     769 
     770/* "\"User\\\\\" <sip:localhost>" */ 
     771static pjsip_uri *create_uri39(pj_pool_t *pool) 
     772{ 
     773    pjsip_name_addr *name_addr = pjsip_name_addr_create(pool); 
     774    pjsip_sip_uri *url; 
     775 
     776    url = pjsip_sip_uri_create(pool, 0); 
     777    name_addr->uri = (pjsip_uri*) url; 
     778 
     779    pj_strdup2(pool, &name_addr->display, "User\\\\"); 
     780    pj_strdup2(pool, &url->host, "localhost"); 
     781    return (pjsip_uri*)name_addr; 
    760782} 
    761783 
Note: See TracChangeset for help on using the changeset viewer.