Make sure This->bsc.doc will be initialized while opening a zero byte html file, fix bug 25999 . modified: dlls/mshtml/navigate.c

[Zhuo Wei]

---
 dlls/mshtml/navigate.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index bb71c79..0e7a298 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -985,8 +985,6 @@ static HRESULT read_stream_data(nsChannelBSC
*This, IStream *stream)
         read = 0;
         hres = IStream_Read(stream,
This->nsstream->buf+This->nsstream->buf_size,
                 sizeof(This->nsstream->buf)-This->nsstream->buf_size, &read);
-        if(!read)
-            break;

         This->nsstream->buf_size += read;

@@ -1014,6 +1012,9 @@ static HRESULT read_stream_data(nsChannelBSC
*This, IStream *stream)
             on_start_nsrequest(This);
         }

+        if(!read)
+            break;
+
         This->bsc.readed += This->nsstream->buf_size;

         nsres = nsIStreamListener_OnDataAvailable(This->nslistener,
-- 
1.7.1


-- 
Regards,
Qian Hong
-
Sent from Ubuntu
http://www.ubuntu.com/

--20cf30427194c31d63049de6fe5f
Content-Type: text/plain; charset=US-ASCII; 
	name="0001-Make-sure-This-bsc.doc-will-be-initialized-while-openi.txt"
Content-Disposition: attachment; 
	filename="0001-Make-sure-This-bsc.doc-will-be-initialized-while-openi.txt"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gkzl5hv50

RnJvbSBjNWVlOTgzOTYxMjNjNmNjY2RkMjk1MDI1YTZiNWFjZWI4N2RjMGY3IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBaaHVvIFdlaSA8emh1by53ZWkubWF0aEBnbWFpbC5jb20+CkRh
dGU6IE1vbiwgNyBNYXIgMjAxMSAyMzo1ODowOSArMDgwMApTdWJqZWN0OiBNYWtlIHN1cmUgVGhp
cy0+YnNjLmRvYyB3aWxsIGJlIGluaXRpYWxpemVkIHdoaWxlIG9wZW5pbmcgYSB6ZXJvCiBieXRl
IGh0bWwgZmlsZSwgZml4IGJ1ZyAyNTk5OSAuCiAJbW9kaWZpZWQ6ICAgZGxscy9tc2h0bWwvbmF2
aWdhdGUuYwoKLS0tCiBkbGxzL21zaHRtbC9uYXZpZ2F0ZS5jIHwgICAgNSArKystLQogMSBmaWxl
cyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv
ZGxscy9tc2h0bWwvbmF2aWdhdGUuYyBiL2RsbHMvbXNodG1sL25hdmlnYXRlLmMKaW5kZXggYmI3
MWM3OS4uMGU3YTI5OCAxMDA2NDQKLS0tIGEvZGxscy9tc2h0bWwvbmF2aWdhdGUuYworKysgYi9k
bGxzL21zaHRtbC9uYXZpZ2F0ZS5jCkBAIC05ODUsOCArOTg1LDYgQEAgc3RhdGljIEhSRVNVTFQg
cmVhZF9zdHJlYW1fZGF0YShuc0NoYW5uZWxCU0MgKlRoaXMsIElTdHJlYW0gKnN0cmVhbSkKICAg
ICAgICAgcmVhZCA9IDA7CiAgICAgICAgIGhyZXMgPSBJU3RyZWFtX1JlYWQoc3RyZWFtLCBUaGlz
LT5uc3N0cmVhbS0+YnVmK1RoaXMtPm5zc3RyZWFtLT5idWZfc2l6ZSwKICAgICAgICAgICAgICAg
ICBzaXplb2YoVGhpcy0+bnNzdHJlYW0tPmJ1ZiktVGhpcy0+bnNzdHJlYW0tPmJ1Zl9zaXplLCAm
cmVhZCk7Ci0gICAgICAgIGlmKCFyZWFkKQotICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAg
VGhpcy0+bnNzdHJlYW0tPmJ1Zl9zaXplICs9IHJlYWQ7CiAKQEAgLTEwMTQsNiArMTAxMiw5IEBA
IHN0YXRpYyBIUkVTVUxUIHJlYWRfc3RyZWFtX2RhdGEobnNDaGFubmVsQlNDICpUaGlzLCBJU3Ry
ZWFtICpzdHJlYW0pCiAgICAgICAgICAgICBvbl9zdGFydF9uc3JlcXVlc3QoVGhpcyk7CiAgICAg
ICAgIH0KIAorICAgICAgICBpZighcmVhZCkKKyAgICAgICAgICAgIGJyZWFrOworCiAgICAgICAg
IFRoaXMtPmJzYy5yZWFkZWQgKz0gVGhpcy0+bnNzdHJlYW0tPmJ1Zl9zaXplOwogCiAgICAgICAg
IG5zcmVzID0gbnNJU3RyZWFtTGlzdGVuZXJfT25EYXRhQXZhaWxhYmxlKFRoaXMtPm5zbGlzdGVu
ZXIsCi0tIAoxLjcuMQoK
--20cf30427194c31d63049de6fe5f--