"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "encoding/apr_escape.c" between
apr-1.6.5.tar.bz2 and apr-1.7.0.tar.bz2

About: APR (Apache Portable Runtime) project offers software libraries that provide a predictable and consistent interface to underlying platform-specific implementations (APR core library).

apr_escape.c  (apr-1.6.5.tar.bz2):apr_escape.c  (apr-1.7.0.tar.bz2)
skipping to change at line 30 skipping to change at line 30
* pairs, a function to query the length of and escape existing buffers, as * pairs, a function to query the length of and escape existing buffers, as
* well as companion functions to perform the same process to memory * well as companion functions to perform the same process to memory
* allocated from a pool. * allocated from a pool.
* *
* The API is designed to have the smallest possible RAM footprint, and so * The API is designed to have the smallest possible RAM footprint, and so
* will only allocate the exact amount of RAM needed for each conversion. * will only allocate the exact amount of RAM needed for each conversion.
*/ */
#include "apr_escape.h" #include "apr_escape.h"
#include "apr_escape_test_char.h" #include "apr_escape_test_char.h"
#include "apr_encode_private.h"
#include "apr_lib.h" #include "apr_lib.h"
#include "apr_strings.h" #include "apr_strings.h"
#if APR_CHARSET_EBCDIC
static int convert_a2e[256] = {
0x00, 0x01, 0x02, 0x03, 0x37, 0x2D, 0x2E, 0x2F, 0x16, 0x05, 0x15, 0x0B, 0x0C,
0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x12, 0x13, 0x3C, 0x3D, 0x32, 0x26, 0x18, 0x19, 0x3F, 0x27, 0x1C,
0x1D, 0x1E, 0x1F,
0x40, 0x5A, 0x7F, 0x7B, 0x5B, 0x6C, 0x50, 0x7D, 0x4D, 0x5D, 0x5C, 0x4E, 0x6B,
0x60, 0x4B, 0x61,
0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0x7A, 0x5E, 0x4C,
0x7E, 0x6E, 0x6F,
0x7C, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xD1, 0xD2, 0xD3,
0xD4, 0xD5, 0xD6,
0xD7, 0xD8, 0xD9, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xAD, 0xE0,
0xBD, 0x5F, 0x6D,
0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93,
0x94, 0x95, 0x96,
0x97, 0x98, 0x99, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xC0, 0x4F,
0xD0, 0xA1, 0x07,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x06, 0x17, 0x28, 0x29, 0x2A, 0x2B, 0x2C,
0x09, 0x0A, 0x1B,
0x30, 0x31, 0x1A, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3A, 0x3B, 0x04,
0x14, 0x3E, 0xFF,
0x41, 0xAA, 0x4A, 0xB1, 0x9F, 0xB2, 0x6A, 0xB5, 0xBB, 0xB4, 0x9A, 0x8A, 0xB0,
0xCA, 0xAF, 0xBC,
0x90, 0x8F, 0xEA, 0xFA, 0xBE, 0xA0, 0xB6, 0xB3, 0x9D, 0xDA, 0x9B, 0x8B, 0xB7,
0xB8, 0xB9, 0xAB,
0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9E, 0x68, 0x74, 0x71, 0x72, 0x73, 0x78,
0x75, 0x76, 0x77,
0xAC, 0x69, 0xED, 0xEE, 0xEB, 0xEF, 0xEC, 0xBF, 0x80, 0xFD, 0xFE, 0xFB, 0xFC,
0xBA, 0xAE, 0x59,
0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9C, 0x48, 0x54, 0x51, 0x52, 0x53, 0x58,
0x55, 0x56, 0x57,
0x8C, 0x49, 0xCD, 0xCE, 0xCB, 0xCF, 0xCC, 0xE1, 0x70, 0xDD, 0xDE, 0xDB, 0xDC,
0x8D, 0x8E, 0xDF };
static int convert_e2a[256] = {
0x00, 0x01, 0x02, 0x03, 0x9C, 0x09, 0x86, 0x7F, 0x97, 0x8D, 0x8E, 0x0B, 0x0C,
0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x12, 0x13, 0x9D, 0x0A, 0x08, 0x87, 0x18, 0x19, 0x92, 0x8F, 0x1C,
0x1D, 0x1E, 0x1F,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x17, 0x1B, 0x88, 0x89, 0x8A, 0x8B, 0x8C,
0x05, 0x06, 0x07,
0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, 0x98, 0x99, 0x9A, 0x9B, 0x14,
0x15, 0x9E, 0x1A,
0x20, 0xA0, 0xE2, 0xE4, 0xE0, 0xE1, 0xE3, 0xE5, 0xE7, 0xF1, 0xA2, 0x2E, 0x3C,
0x28, 0x2B, 0x7C,
0x26, 0xE9, 0xEA, 0xEB, 0xE8, 0xED, 0xEE, 0xEF, 0xEC, 0xDF, 0x21, 0x24, 0x2A,
0x29, 0x3B, 0x5E,
0x2D, 0x2F, 0xC2, 0xC4, 0xC0, 0xC1, 0xC3, 0xC5, 0xC7, 0xD1, 0xA6, 0x2C, 0x25,
0x5F, 0x3E, 0x3F,
0xF8, 0xC9, 0xCA, 0xCB, 0xC8, 0xCD, 0xCE, 0xCF, 0xCC, 0x60, 0x3A, 0x23, 0x40,
0x27, 0x3D, 0x22,
0xD8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0xAB, 0xBB, 0xF0,
0xFD, 0xFE, 0xB1,
0xB0, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0xAA, 0xBA, 0xE6,
0xB8, 0xC6, 0xA4,
0xB5, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0xA1, 0xBF, 0xD0,
0x5B, 0xDE, 0xAE,
0xAC, 0xA3, 0xA5, 0xB7, 0xA9, 0xA7, 0xB6, 0xBC, 0xBD, 0xBE, 0xDD, 0xA8, 0xAF,
0x5D, 0xB4, 0xD7,
0x7B, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0xAD, 0xF4, 0xF6,
0xF2, 0xF3, 0xF5,
0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0xB9, 0xFB, 0xFC,
0xF9, 0xFA, 0xFF,
0x5C, 0xF7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0xB2, 0xD4, 0xD6,
0xD2, 0xD3, 0xD5,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0xB3, 0xDB, 0xDC,
0xD9, 0xDA, 0x9F };
#define RAW_ASCII_CHAR(ch) convert_e2a[(unsigned char)ch]
#else /* APR_CHARSET_EBCDIC */
#define RAW_ASCII_CHAR(ch) (ch)
#endif /* !APR_CHARSET_EBCDIC */
/* we assume the folks using this ensure 0 <= c < 256... which means /* we assume the folks using this ensure 0 <= c < 256... which means
* you need a cast to (unsigned char) first, you can't just plug a * you need a cast to (unsigned char) first, you can't just plug a
* char in here and get it to work, because if char is signed then it * char in here and get it to work, because if char is signed then it
* will first be sign extended. * will first be sign extended.
*/ */
#define TEST_CHAR(c, f) (test_char_table[(unsigned)(c)] & (f)) #define TEST_CHAR(c, f) (test_char_table[(unsigned)(c)] & (f))
APR_DECLARE(apr_status_t) apr_escape_shell(char *escaped, const char *str, APR_DECLARE(apr_status_t) apr_escape_shell(char *escaped, const char *str,
apr_ssize_t slen, apr_size_t *len) apr_ssize_t slen, apr_size_t *len)
{ {
skipping to change at line 174 skipping to change at line 134
((what[0] >= 'A') ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0')) ; ((what[0] >= 'A') ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0')) ;
digit *= 16; digit *= 16;
digit += (what[1] >= 'A' ? ((what[1] & 0xdf) - 'A') + 10 : (what[1] - '0')); digit += (what[1] >= 'A' ? ((what[1] & 0xdf) - 'A') + 10 : (what[1] - '0'));
#else /*APR_CHARSET_EBCDIC*/ #else /*APR_CHARSET_EBCDIC*/
char xstr[5]; char xstr[5];
xstr[0]='0'; xstr[0]='0';
xstr[1]='x'; xstr[1]='x';
xstr[2]=what[0]; xstr[2]=what[0];
xstr[3]=what[1]; xstr[3]=what[1];
xstr[4]='\0'; xstr[4]='\0';
digit = convert_a2e[0xFF & strtol(xstr, NULL, 16)]; digit = ENCODE_TO_NATIVE[0xFF & strtol(xstr, NULL, 16)];
#endif /*APR_CHARSET_EBCDIC*/ #endif /*APR_CHARSET_EBCDIC*/
return (digit); return (digit);
} }
APR_DECLARE(apr_status_t) apr_unescape_url(char *escaped, const char *url, APR_DECLARE(apr_status_t) apr_unescape_url(char *escaped, const char *url,
apr_ssize_t slen, const char *forbid, const char *reserved, int plus, apr_ssize_t slen, const char *forbid, const char *reserved, int plus,
apr_size_t *len) apr_size_t *len)
{ {
apr_size_t size = 1; apr_size_t size = 1;
int found = 0; int found = 0;
skipping to change at line 759 skipping to change at line 719
for (j = 2, val = 0; j < i && apr_isdigit(s[j]); j++) { for (j = 2, val = 0; j < i && apr_isdigit(s[j]); j++) {
val = val * 10 + s[j] - '0'; val = val * 10 + s[j] - '0';
} }
s += i; s += i;
if (j < i || val <= 8 || (val >= 11 && val <= 31) if (j < i || val <= 8 || (val >= 11 && val <= 31)
|| (val >= 127 && val <= 160) || val >= 256) { || (val >= 127 && val <= 160) || val >= 256) {
d--; /* no data to output */ d--; /* no data to output */
size--; size--;
} }
else { else {
*d = RAW_ASCII_CHAR(val); *d = ENCODE_TO_ASCII(val);
found = 1; found = 1;
} }
} }
else { else {
j = i - 1; j = i - 1;
if (j > MAXENTLEN || entlist[j] == NULL) { if (j > MAXENTLEN || entlist[j] == NULL) {
/* wrong length */ /* wrong length */
*d = '&'; *d = '&';
continue; /* skip it */ continue; /* skip it */
} }
for (ents = entlist[j]; *ents != '\0'; ents += i) { for (ents = entlist[j]; *ents != '\0'; ents += i) {
if (strncmp(s + 1, ents, j) == 0) { if (strncmp(s + 1, ents, j) == 0) {
break; break;
} }
} }
if (*ents == '\0') { if (*ents == '\0') {
*d = '&'; /* unknown */ *d = '&'; /* unknown */
} }
else { else {
*d = RAW_ASCII_CHAR(((const unsigned char *) ents)[j]); *d = ENCODE_TO_ASCII(((const unsigned char *) ents)[j]);
s += i; s += i;
slen -= i; slen -= i;
found = 1; found = 1;
} }
} }
} }
*d = '\0'; *d = '\0';
} }
else { else {
for (; *s != '\0' && slen; s++, size++, slen--) { for (; *s != '\0' && slen; s++, size++, slen--) {
 End of changes. 5 change blocks. 
76 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)