archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed behavior with empty doc_root.

Browse source 
gzgetss() now uses _php3_strip_tags.
This commit is contained in:
Stefan Roehrich 1999-09-07 19:05:37 +00:00
parent 5c40e7c41e
commit 06362129fa
1 changed files with 10 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

93
ext/zlib/zlib.c
View file

@ -203,7 +203,11 @@ static gzFile *php3_gzopen_with_path(char *filename, char *mode, char *path, cha
if (*filename == '/') {
#endif
if (PG(safe_mode)) {
snprintf(trypath,MAXPATHLEN,"%s%s",PG(doc_root),filename);
if(PG(doc_root)) {
snprintf(trypath, MAXPATHLEN, "%s%s", PG(doc_root), filename);
} else {
strncpy(trypath,filename,MAXPATHLEN);
}
if (!_php3_checkuid(trypath,2)) {
return(NULL);
}
@ -478,8 +482,8 @@ PHP_FUNCTION(gzgetss)
{
pval *fd, *bytes;
gzFile *zp;
int len, br;
char *buf, *p, *rbuf, *rp, c, lc;
int len;
char *buf;
ZLIBLS_FETCH();
if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &fd, &bytes) == FAILURE) {
@ -500,86 +504,9 @@ PHP_FUNCTION(gzgetss)
RETURN_FALSE;
}
rbuf = estrdup(buf);
c = *buf;
lc = '\0';
p = buf;
rp = rbuf;
br = 0;
while (c) {
switch (c) {
case '<':
if (ZLIBG(gzgetss_state) == 0) {
lc = '<';
ZLIBG(gzgetss_state) = 1;
}
break;
case '(':
if (ZLIBG(gzgetss_state) == 2) {
if (lc != '\"') {
lc = '(';
br++;
}
} else if (ZLIBG(gzgetss_state) == 0) {
*(rp++) = c;
}
break;
case ')':
if (ZLIBG(gzgetss_state) == 2) {
if (lc != '\"') {
lc = ')';
br--;
}
} else if (ZLIBG(gzgetss_state) == 0) {
*(rp++) = c;
}
break;
case '>':
if (ZLIBG(gzgetss_state) == 1) {
lc = '>';
ZLIBG(gzgetss_state) = 0;
} else if (ZLIBG(gzgetss_state) == 2) {
if (!br && lc != '\"') {
ZLIBG(gzgetss_state) = 0;
}
}
break;
case '\"':
if (ZLIBG(gzgetss_state) == 2) {
if (lc == '\"') {
lc = '\0';
} else if (lc != '\\') {
lc = '\"';
}
} else if (ZLIBG(gzgetss_state) == 0) {
*(rp++) = c;
}
break;
case '?':
if (ZLIBG(gzgetss_state)==1) {
br=0;
ZLIBG(gzgetss_state)=2;
break;
}
/* fall-through */
default:
if (ZLIBG(gzgetss_state) == 0) {
*(rp++) = c;
}
}
c = *(++p);
}
*rp = '\0';
efree(buf);
RETVAL_STRING(rbuf,1);
efree(rbuf);
_php3_strip_tags(buf, ZLIBG(gzgetss_state));
RETURN_STRING(buf, 0);
}
/* }}} */