mirror of
https://github.com/php/php-src.git
synced 2024-09-24 11:27:28 +00:00
- switched src and dest in memcpy. This caused a segm fault in hw_new_document_from_file()
This commit is contained in:
parent
90544a10ee
commit
9290bf04e8
@ -2911,9 +2911,9 @@ PHP_FUNCTION(hw_new_document_from_file)
|
||||
fstat(fd, &sbuf);
|
||||
|
||||
if (sbuf.st_size > BUFSIZE) {
|
||||
/* off = ftell(fp); */
|
||||
len = sbuf.st_size;/* - off; */
|
||||
p = mmap(0, len, PROT_READ, MAP_PRIVATE, fd, off);
|
||||
off = ftell(fp);
|
||||
len = sbuf.st_size - off;
|
||||
p = mmap(0, len, PROT_READ, MAP_SHARED, fd, off);
|
||||
if (p != (void *) MAP_FAILED) {
|
||||
doc->data = malloc(len);
|
||||
if(NULL == doc->data) {
|
||||
@ -2921,7 +2921,7 @@ PHP_FUNCTION(hw_new_document_from_file)
|
||||
free(doc);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
memcpy(p, doc->data, len);
|
||||
memcpy(doc->data, p, len);
|
||||
munmap(p, len);
|
||||
bcount = len;
|
||||
doc->size = len;
|
||||
|
Loading…
Reference in New Issue
Block a user