lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-13 09:01:53 +03:00
Code Activity

Applied a bug fix on file reading code from John Ellson <ellson@lucent.com>, Daniel.

Browse Source
This commit is contained in:
Daniel Veillard
1999-07-09 10:11:57 +00:00
parent 82150d8a99
commit 7cc3c04b80
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jul 9 12:10:24 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org>
* HTMLparser.c parser.c: applied patch from John Ellson <ellson@lucent.com>
which fixed a problem on the file reading-code.
Wed Jul 7 09:28:43 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org> Wed Jul 7 09:28:43 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org>
* HTMLparser.[ch], HTMLtree.[ch]: more work for HTML parsing and * HTMLparser.[ch], HTMLtree.[ch]: more work for HTML parsing and

6
HTMLparser.c
View File

@ -2630,11 +2630,11 @@ htmlCreateFileParserCtxt(const char *filename, const char *encoding)
res = stat(filename, &buf); res = stat(filename, &buf);
if (res < 0) if (res < 0)
return(NULL); return(NULL);
len = buf.st_size + 1; len = buf.st_size;
if (len < MINLEN) if (len < MINLEN)
len = MINLEN; len = MINLEN;
} }
buffer = (char *)malloc(len*sizeof(char)); buffer = (char *)malloc((len+1)*sizeof(char));
if (buffer == NULL) { if (buffer == NULL) {
fprintf (stderr, "Cannot malloc\n"); fprintf (stderr, "Cannot malloc\n");
perror ("malloc failed"); perror ("malloc failed");
@ -2649,7 +2649,7 @@ htmlCreateFileParserCtxt(const char *filename, const char *encoding)
#endif #endif
if (cnt == len) { if (cnt == len) {
len *= 2; len *= 2;
nbuf = (char *)realloc(buffer,len*sizeof(char)); nbuf = (char *)realloc(buffer,(len+1)*sizeof(char));
if (nbuf == NULL) { if (nbuf == NULL) {
fprintf(stderr,"Cannot realloc\n"); fprintf(stderr,"Cannot realloc\n");
free(buffer); free(buffer);

12
parser.c
View File

@ -316,11 +316,11 @@ xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename) {
res = stat(filename, &buf); res = stat(filename, &buf);
if (res < 0) if (res < 0)
return(NULL); return(NULL);
len = buf.st_size+1; len = buf.st_size;
if (len < MINLEN) if (len < MINLEN)
len = MINLEN; len = MINLEN;
} }
buffer = (char *)malloc(len*sizeof(char)); buffer = (char *)malloc((len+1)*sizeof(char));
if (buffer == NULL) { if (buffer == NULL) {
fprintf (stderr, "Cannot malloc\n"); fprintf (stderr, "Cannot malloc\n");
perror ("malloc failed"); perror ("malloc failed");
@ -335,7 +335,7 @@ xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename) {
#endif #endif
if (cnt >= len) { if (cnt >= len) {
len *= 2; len *= 2;
nbuf = (char *)realloc(buffer,len*sizeof(char)); nbuf = (char *)realloc(buffer,(len+1)*sizeof(char));
if (nbuf == NULL) { if (nbuf == NULL) {
fprintf(stderr,"Cannot realloc\n"); fprintf(stderr,"Cannot realloc\n");
free(buffer); free(buffer);
@ -4683,11 +4683,11 @@ xmlCreateFileParserCtxt(const char *filename)
res = stat(filename, &buf); res = stat(filename, &buf);
if (res < 0) if (res < 0)
return(NULL); return(NULL);
len = buf.st_size+1; len = buf.st_size;
if (len < MINLEN) if (len < MINLEN)
len = MINLEN; len = MINLEN;
} }
buffer = (char *)malloc(len*sizeof(char)); buffer = (char *)malloc((len+1)*sizeof(char));
if (buffer == NULL) { if (buffer == NULL) {
fprintf (stderr, "Cannot malloc\n"); fprintf (stderr, "Cannot malloc\n");
perror ("malloc failed"); perror ("malloc failed");
@ -4702,7 +4702,7 @@ xmlCreateFileParserCtxt(const char *filename)
#endif #endif
if (cnt == len) { if (cnt == len) {
len *= 2; len *= 2;
nbuf = (char *)realloc(buffer,len*sizeof(char)); nbuf = (char *)realloc(buffer,(len+1)*sizeof(char));
if (nbuf == NULL) { if (nbuf == NULL) {
fprintf(stderr,"Cannot realloc\n"); fprintf(stderr,"Cannot realloc\n");
free(buffer); free(buffer);