shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-12-31 17:17:37 +03:00
Code

fixed the fix for the buffer overflow, thanks William :-)

Browse Source
This commit is contained in:
Igor Zlatkovic 2004-02-09 17:40:31 +00:00
parent 2e6b143e8a
commit 537769a65f
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Feb 9 18:40:21 CET 2004 Igor Zlatkovic <igor@zlatkovic.com>
* nanohttp.c: fixed the fix for the buffer overflow, thanx
William :-)
Mon Feb 9 22:37:14 HKT 2004 William Brack <wbrack@mmm.com.hk>
* acinclude.m4, configure.in: fixed problem concerning

16
nanohttp.c
View File

@ -272,6 +272,7 @@ xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ctxt, const char *URL) {
const char *cur = URL;
char buf[4096];
int indx = 0;
const int indxMax = 4096 - 1;
int port = 0;
if (ctxt->protocol != NULL) {
@ -288,7 +289,7 @@ xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ctxt, const char *URL) {
}
if (URL == NULL) return;
buf[indx] = 0;
while ((*cur != 0) && (indx < 4096)) {
while ((*cur != 0) && (indx < indxMax)) {
if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
buf[indx] = 0;
ctxt->protocol = xmlMemStrdup(buf);
@ -301,7 +302,7 @@ xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ctxt, const char *URL) {
if (*cur == 0) return;
buf[indx] = 0;
while (indx < 4096) {
while (indx < indxMax) {
if ((strchr (cur, '[') && !strchr (cur, ']')) ||
(!strchr (cur, '[') && strchr (cur, ']'))) {
__xmlIOErr(XML_FROM_HTTP, XML_HTTP_URL_SYNTAX,
@ -311,7 +312,7 @@ xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ctxt, const char *URL) {
if (cur[0] == '[') {
cur++;
while ((cur[0] != ']') && (indx < 4096))
while ((cur[0] != ']') && (indx < indxMax))
buf[indx++] = *cur++;
if (!strchr (buf, ':')) {
@ -368,7 +369,7 @@ xmlNanoHTTPScanURL(xmlNanoHTTPCtxtPtr ctxt, const char *URL) {
else {
indx = 0;
buf[indx] = 0;
while ((*cur != 0) && (indx < 4096))
while ((*cur != 0) && (indx < indxMax))
buf[indx++] = *cur++;
buf[indx] = 0;
ctxt->path = xmlMemStrdup(buf);
@ -390,6 +391,7 @@ xmlNanoHTTPScanProxy(const char *URL) {
const char *cur = URL;
char buf[4096];
int indx = 0;
const int indxMax = 4096 - 1;
int port = 0;
if (proxy != NULL) {
@ -409,7 +411,7 @@ xmlNanoHTTPScanProxy(const char *URL) {
#endif
if (URL == NULL) return;
buf[indx] = 0;
while (*cur != 0) {
while ((*cur != 0) && (indx < indxMax)) {
if ((cur[0] == ':') && (cur[1] == '/') && (cur[2] == '/')) {
buf[indx] = 0;
indx = 0;
@ -421,7 +423,7 @@ xmlNanoHTTPScanProxy(const char *URL) {
if (*cur == 0) return;
buf[indx] = 0;
while (1) {
while (indx < indxMax) {
if ((strchr (cur, '[') && !strchr (cur, ']')) ||
(!strchr (cur, '[') && strchr (cur, ']'))) {
__xmlIOErr(XML_FROM_HTTP, XML_HTTP_URL_SYNTAX, "Syntax Error\n");
@ -430,7 +432,7 @@ xmlNanoHTTPScanProxy(const char *URL) {
if (cur[0] == '[') {
cur++;
while (cur[0] != ']')
while ((cur[0] != ']') && (indx < indxMax))
buf[indx++] = *cur++;
if (!strchr (buf, ':')) {