81356 2012-03-16 09:00:44 -0700 [BlackBerry] Fix layering violations in network/blackberry 2014-01-28 08:24:27 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 joenotcharles joenotcharles andersca jasonliuwebkit joenotcharles kpiascik staikos tonikitoo oldest_to_newest 580556 0 joenotcharles 2012-03-16 09:00:44 -0700 NetworkManager.cpp contains this code: static_cast<FrameLoaderClientBlackBerry*>(frame.loader()->client())->cookiesEnabled() This (and any similar casts) should be using PageClientBlackBerry instead. See https://bugs.webkit.org/show_bug.cgi?id=80401 for an example. 583901 1 132993 jasonliuwebkit 2012-03-21 01:47:39 -0700 Created attachment 132993 Patch 583955 2 133003 jasonliuwebkit 2012-03-21 03:31:14 -0700 Created attachment 133003 Patch 584184 3 joenotcharles 2012-03-21 09:00:13 -0700 (In reply to comment #2) > Created an attachment (id=133003) [details] > Patch That won't work - CookieJar::cookiesEnabled is unimplemented. Probably it should be, but that's a separate bug. I have a patch here that fixes this and a bunch of other layering violations. I just haven't had time to finish it off. Don't waste any more time on this - I'll get to it by the end of the week. 584915 4 jasonliuwebkit 2012-03-21 20:06:56 -0700 (In reply to comment #3) > (In reply to comment #2) > > Created an attachment (id=133003) [details] [details] > > Patch > > That won't work - CookieJar::cookiesEnabled is unimplemented. Probably it should be, but that's a separate bug. > > I have a patch here that fixes this and a bunch of other layering violations. I just haven't had time to finish it off. Don't waste any more time on this - I'll get to it by the end of the week. I am sorry to hear about that. I thought this is another bug for my 80800. I won't do any more on this bug. And thanks a lot for your reviewing of my patches. 594839 5 133003 rwlbuis 2012-04-03 13:44:00 -0700 Comment on attachment 133003 Patch Get this out of the review queue, based on Joe's remarks. 132993 2012-03-21 01:47:39 -0700 2012-03-21 03:31:06 -0700 Patch bug-81356-20120321164737.patch text/plain 5407 jasonliuwebkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmM1N2Q1NmE0NmMzZTgw NWY0ZWVjNTY4OWVmZTYwZGE2YWI0MWUyMC4uNjU5NmUyYjA4ZmJiNmJiZWU2MTRiOWFiNGVlNDE2 N2M2NWQxNWRmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAzLTIxICBKYXNv biBMaXUgIDxqYXNvbi5saXVAdG9yY2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0Jl cnJ5XSBGaXggbGF5ZXJpbmcgdmlvbGF0aW9ucyBpbiBuZXR3b3JrL2JsYWNrYmVycnkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMzU2CisKKyAgICAg ICAgVXNlIGNvb2tpZXNFbmFibGVkKCkgb2YgY29va2llSmFyIGluc3RlYWQgb2YgRnJhbWVMb2Fk ZXJDbGllbnRCbGFja0JlcnJ5J3MKKyAgICAgICAgY29va2llc0VuYWJsZWQoKS4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIEp1 c3QgcmVmYWN0b3IgY29va2llRW5hYmxlZCdzIGNhbGxpbmcuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ibGFja2JlcnJ5L0Nvb2tpZUphckJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Y29va2llcyk6CisgICAgICAgIChXZWJDb3JlOjpzZXRDb29raWVzKToKKyAgICAgICAgKFdlYkNv cmU6OmNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOZXR3 b3JrSm9iOjpoYW5kbGVOb3RpZnlIZWFkZXJSZWNlaXZlZCk6CisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok5ldHdvcmtNYW5hZ2VyOjpzdGFydEpvYik6CisKIDIwMTItMDMtMjEgIENoYXJsZXMgV2VpICA8 Y2hhcmxlcy53ZWlAdG9yY2htb2JpbGUuY29tLmNuPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBS ZW1vdmUgcmVkdW5kYW50IGNvZGUgaW4gU29ja2V0U3RyZWFtSGFuZGxlcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVKYXJCbGFja0JlcnJ5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llSmFyQmxhY2tCZXJy eS5jcHAKaW5kZXggMzk1YzZhZjI3ODQzYzAwMjAzN2VjZWU5N2Q4ZjAzYWNkNzUxNWI2My4uMDI5 N2I3MzMyMjk2NjQzNjE1YmMxNzQzZjZmOGY3ODFiMDU0MTcxYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVKYXJCbGFja0JlcnJ5LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZUphckJsYWNrQmVycnku Y3BwCkBAIC00MCwxMyArNDAsNyBAQCBTdHJpbmcgY29va2llcyhEb2N1bWVudCBjb25zdCogZG9j dW1lbnQsIEtVUkwgY29uc3QmIHVybCkKICAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ZnJh bWUoKTsKICAgICBQYWdlKiBwYWdlID0gZnJhbWUgPyBmcmFtZS0+cGFnZSgpIDogMDsKIAotICAg IGlmICghcGFnZSkKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOwotCi0gICAgaWYgKCEoZnJhbWUg JiYgZnJhbWUtPmxvYWRlcigpICYmIGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkpKQotICAgICAg ICByZXR1cm4gU3RyaW5nKCk7Ci0KLSAgICBpZiAoIXN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xp ZW50QmxhY2tCZXJyeSo+KGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkpLT5jb29raWVzRW5hYmxl ZCgpKQorICAgIGlmICghcGFnZSB8fCAhY29va2llc0VuYWJsZWQoZG9jdW1lbnQpKQogICAgICAg ICByZXR1cm4gU3RyaW5nKCk7CiAKICAgICBBU1NFUlQoZG9jdW1lbnQgJiYgdXJsID09IGRvY3Vt ZW50LT5jb29raWVVUkwoKSk7CkBAIC01OSwxMyArNTMsNyBAQCB2b2lkIHNldENvb2tpZXMoRG9j dW1lbnQqIGRvY3VtZW50LCBLVVJMIGNvbnN0JiB1cmwsIFN0cmluZyBjb25zdCYgdmFsdWUpCiAg ICAgRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQtPmZyYW1lKCk7CiAgICAgUGFnZSogcGFnZSA9IGZy YW1lID8gZnJhbWUtPnBhZ2UoKSA6IDA7CiAKLSAgICBpZiAoIXBhZ2UpCi0gICAgICAgIHJldHVy bjsKLQotICAgIGlmICghKGZyYW1lICYmIGZyYW1lLT5sb2FkZXIoKSAmJiBmcmFtZS0+bG9hZGVy KCktPmNsaWVudCgpKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKCFzdGF0aWNfY2FzdDxG cmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkqPihmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpKS0+ Y29va2llc0VuYWJsZWQoKSkKKyAgICBpZiAoIXBhZ2UgfHwgIWNvb2tpZXNFbmFibGVkKGRvY3Vt ZW50KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgQVNTRVJUKGRvY3VtZW50ICYmIHVybCA9PSBk b2N1bWVudC0+Y29va2llVVJMKCkpOwpAQCAtOTgsMTAgKzg2LDcgQEAgU3RyaW5nIGNvb2tpZVJl cXVlc3RIZWFkZXJGaWVsZFZhbHVlKGNvbnN0IERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgS1VS TCAmdXJsKQogewogICAgIEFTU0VSVChkb2N1bWVudCk7CiAKLSAgICBpZiAoIShkb2N1bWVudC0+ ZnJhbWUoKSAmJiBkb2N1bWVudC0+ZnJhbWUoKS0+bG9hZGVyKCkgJiYgZG9jdW1lbnQtPmZyYW1l KCktPmxvYWRlcigpLT5jbGllbnQoKSkpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLQotICAg IGlmICghc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Kj4oZG9jdW1lbnQt PmZyYW1lKCktPmxvYWRlcigpLT5jbGllbnQoKSktPmNvb2tpZXNFbmFibGVkKCkpCisgICAgaWYg KCFjb29raWVzRW5hYmxlZChkb2N1bWVudCkpCiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKIAog ICAgIHJldHVybiBjb29raWVNYW5hZ2VyKCkuZ2V0Q29va2llKHVybCwgV2l0aEh0dHBPbmx5Q29v a2llcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNr YmVycnkvTmV0d29ya0pvYi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Js YWNrYmVycnkvTmV0d29ya0pvYi5jcHAKaW5kZXggNjBjYzg2YzNmMjA5ZTU3YjVhMjVhMjZmOGZi ZTkzYTcwYzI1YzJkOC4uNTUyNzhiODkwYWU2OWVkZGI5MTI5NGJlZTc2YTJkZDQ2NDA5ZGM2MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05l dHdvcmtKb2IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2ti ZXJyeS9OZXR3b3JrSm9iLmNwcApAQCAtMjEsNiArMjEsNyBAQAogCiAjaW5jbHVkZSAiQWJvdXRE YXRhLmgiCiAjaW5jbHVkZSAiQmFzZTY0LmgiCisjaW5jbHVkZSAiQ29va2llSmFyLmgiCiAjaW5j bHVkZSAiQ29va2llTWFuYWdlci5oIgogI2luY2x1ZGUgIkNyZWRlbnRpYWxTdG9yYWdlLmgiCiAj aW5jbHVkZSAiRnJhbWUuaCIKQEAgLTMwNyw4ICszMDgsNyBAQCB2b2lkIE5ldHdvcmtKb2I6Omhh bmRsZU5vdGlmeUhlYWRlclJlY2VpdmVkKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcm IHZhbAogICAgICAgICBtX2NvbnRlbnREaXNwb3NpdGlvbiA9IHZhbHVlOwogCiAgICAgaWYgKGxv d2VyS2V5ID09ICJzZXQtY29va2llIikgewotICAgICAgICBpZiAobV9mcmFtZSAmJiBtX2ZyYW1l LT5sb2FkZXIoKSAmJiBtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkKLSAgICAgICAgICAgICYm IHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeSo+KG1fZnJhbWUtPmxvYWRl cigpLT5jbGllbnQoKSktPmNvb2tpZXNFbmFibGVkKCkpCisgICAgICAgIGlmIChtX2ZyYW1lICYm IGNvb2tpZXNFbmFibGVkKG1fZnJhbWUtPmRvY3VtZW50KCkpKQogICAgICAgICAgICAgaGFuZGxl U2V0Q29va2llSGVhZGVyKHZhbHVlKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrTWFuYWdlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01hbmFnZXIuY3Bw CmluZGV4IGUzODMyZTkzM2Y5MzBhZjg2OGRhZTU2NWZkNzY5YWMwZmQ2ZGE5N2IuLjdkNWYyMGJl MmEzMmVmZDZkN2I3NTliZmZkYjgxYWU2MDQ4ZjE5YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrTWFuYWdlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2Vy LmNwcApAQCAtMjAsOSArMjAsOSBAQAogI2luY2x1ZGUgIk5ldHdvcmtNYW5hZ2VyLmgiCiAKICNp bmNsdWRlICJDaHJvbWUuaCIKKyNpbmNsdWRlICJDb29raWVKYXIuaCIKICNpbmNsdWRlICJDcmVk ZW50aWFsU3RvcmFnZS5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCi0jaW5jbHVkZSAiRnJhbWVMb2Fk ZXJDbGllbnRCbGFja0JlcnJ5LmgiCiAjaW5jbHVkZSAiTmV0d29ya0pvYi5oIgogI2luY2x1ZGUg IlBhZ2UuaCIKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZUludGVybmFsLmgiCkBAIC03Miw3ICs3 Miw3IEBAIGJvb2wgTmV0d29ya01hbmFnZXI6OnN0YXJ0Sm9iKGludCBwbGF5ZXJJZCwgY29uc3Qg U3RyaW5nJiBwYWdlR3JvdXBOYW1lLCBQYXNzUmVmCiAgICAgICAgIG1faW5pdGlhbFVSTCA9IEtV UkwoKTsKIAogICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCBwbGF0Zm9y bVJlcXVlc3Q7Ci0gICAgcmVxdWVzdC5pbml0aWFsaXplUGxhdGZvcm1SZXF1ZXN0KHBsYXRmb3Jt UmVxdWVzdCwgZnJhbWUubG9hZGVyKCkgJiYgZnJhbWUubG9hZGVyKCktPmNsaWVudCgpICYmIHN0 YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeSo+KGZyYW1lLmxvYWRlcigpLT5j bGllbnQoKSktPmNvb2tpZXNFbmFibGVkKCksIGlzSW5pdGlhbCwgcmVkaXJlY3RDb3VudCk7Cisg ICAgcmVxdWVzdC5pbml0aWFsaXplUGxhdGZvcm1SZXF1ZXN0KHBsYXRmb3JtUmVxdWVzdCwgY29v a2llc0VuYWJsZWQoZnJhbWUuZG9jdW1lbnQoKSksIGlzSW5pdGlhbCwgcmVkaXJlY3RDb3VudCk7 CiAKICAgICAvLyBBdHRhY2ggYW55IGFwcGxpY2FibGUgYXV0aCBjcmVkZW50aWFscyB0byB0aGUg TmV0d29ya1JlcXVlc3QuCiAgICAgQXV0aGVudGljYXRpb25DaGFsbGVuZ2UmIGNoYWxsZW5nZSA9 IGd1YXJkSm9iLT5nZXRJbnRlcm5hbCgpLT5tX2N1cnJlbnRXZWJDaGFsbGVuZ2U7Cg== 133003 2012-03-21 03:31:14 -0700 2012-04-03 13:44:00 -0700 Patch bug-81356-20120321183111.patch text/plain 6165 jasonliuwebkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmM1N2Q1NmE0NmMzZTgw NWY0ZWVjNTY4OWVmZTYwZGE2YWI0MWUyMC4uNjU5NmUyYjA4ZmJiNmJiZWU2MTRiOWFiNGVlNDE2 N2M2NWQxNWRmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAzLTIxICBKYXNv biBMaXUgIDxqYXNvbi5saXVAdG9yY2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0Jl cnJ5XSBGaXggbGF5ZXJpbmcgdmlvbGF0aW9ucyBpbiBuZXR3b3JrL2JsYWNrYmVycnkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMzU2CisKKyAgICAg ICAgVXNlIGNvb2tpZXNFbmFibGVkKCkgb2YgY29va2llSmFyIGluc3RlYWQgb2YgRnJhbWVMb2Fk ZXJDbGllbnRCbGFja0JlcnJ5J3MKKyAgICAgICAgY29va2llc0VuYWJsZWQoKS4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIEp1 c3QgcmVmYWN0b3IgY29va2llRW5hYmxlZCdzIGNhbGxpbmcuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ibGFja2JlcnJ5L0Nvb2tpZUphckJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Y29va2llcyk6CisgICAgICAgIChXZWJDb3JlOjpzZXRDb29raWVzKToKKyAgICAgICAgKFdlYkNv cmU6OmNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOZXR3 b3JrSm9iOjpoYW5kbGVOb3RpZnlIZWFkZXJSZWNlaXZlZCk6CisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok5ldHdvcmtNYW5hZ2VyOjpzdGFydEpvYik6CisKIDIwMTItMDMtMjEgIENoYXJsZXMgV2VpICA8 Y2hhcmxlcy53ZWlAdG9yY2htb2JpbGUuY29tLmNuPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBS ZW1vdmUgcmVkdW5kYW50IGNvZGUgaW4gU29ja2V0U3RyZWFtSGFuZGxlcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVKYXJCbGFja0JlcnJ5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llSmFyQmxhY2tCZXJy eS5jcHAKaW5kZXggMzk1YzZhZjI3ODQzYzAwMjAzN2VjZWU5N2Q4ZjAzYWNkNzUxNWI2My4uMGIy ZWMzN2UwYzYzMjQ4MTk5NTQ5ZmI4NTkzMTY4NWRjODhlMjc1ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVKYXJCbGFja0JlcnJ5LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZUphckJsYWNrQmVycnku Y3BwCkBAIC0yNSwxMiArMjUsMTIgQEAKICNpbmNsdWRlICJDb29raWVNYW5hZ2VyLmgiCiAjaW5j bHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJGcmFtZS5oIgotI2luY2x1ZGUgIkZyYW1lTG9h ZGVyQ2xpZW50QmxhY2tCZXJyeS5oIgogI2luY2x1ZGUgIktVUkwuaCIKICNpbmNsdWRlICJOb3RJ bXBsZW1lbnRlZC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQYWdlR3JvdXBMb2Fk RGVmZXJyZXIuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgorI2luY2x1ZGUgIldlYlNldHRpbmdz LmgiCiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CkBAIC00MCwxMyArNDAsNyBAQCBTdHJpbmcgY29va2llcyhEb2N1bWVudCBjb25zdCogZG9jdW1l bnQsIEtVUkwgY29uc3QmIHVybCkKICAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudC0+ZnJhbWUo KTsKICAgICBQYWdlKiBwYWdlID0gZnJhbWUgPyBmcmFtZS0+cGFnZSgpIDogMDsKIAotICAgIGlm ICghcGFnZSkKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOwotCi0gICAgaWYgKCEoZnJhbWUgJiYg ZnJhbWUtPmxvYWRlcigpICYmIGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkpKQotICAgICAgICBy ZXR1cm4gU3RyaW5nKCk7Ci0KLSAgICBpZiAoIXN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50 QmxhY2tCZXJyeSo+KGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkpLT5jb29raWVzRW5hYmxlZCgp KQorICAgIGlmICghcGFnZSB8fCAhY29va2llc0VuYWJsZWQoZG9jdW1lbnQpKQogICAgICAgICBy ZXR1cm4gU3RyaW5nKCk7CiAKICAgICBBU1NFUlQoZG9jdW1lbnQgJiYgdXJsID09IGRvY3VtZW50 LT5jb29raWVVUkwoKSk7CkBAIC01OSwxMyArNTMsNyBAQCB2b2lkIHNldENvb2tpZXMoRG9jdW1l bnQqIGRvY3VtZW50LCBLVVJMIGNvbnN0JiB1cmwsIFN0cmluZyBjb25zdCYgdmFsdWUpCiAgICAg RnJhbWUqIGZyYW1lID0gZG9jdW1lbnQtPmZyYW1lKCk7CiAgICAgUGFnZSogcGFnZSA9IGZyYW1l ID8gZnJhbWUtPnBhZ2UoKSA6IDA7CiAKLSAgICBpZiAoIXBhZ2UpCi0gICAgICAgIHJldHVybjsK LQotICAgIGlmICghKGZyYW1lICYmIGZyYW1lLT5sb2FkZXIoKSAmJiBmcmFtZS0+bG9hZGVyKCkt PmNsaWVudCgpKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKCFzdGF0aWNfY2FzdDxGcmFt ZUxvYWRlckNsaWVudEJsYWNrQmVycnkqPihmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpKS0+Y29v a2llc0VuYWJsZWQoKSkKKyAgICBpZiAoIXBhZ2UgfHwgIWNvb2tpZXNFbmFibGVkKGRvY3VtZW50 KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgQVNTRVJUKGRvY3VtZW50ICYmIHVybCA9PSBkb2N1 bWVudC0+Y29va2llVVJMKCkpOwpAQCAtNzQsOCArNjIsNyBAQCB2b2lkIHNldENvb2tpZXMoRG9j dW1lbnQqIGRvY3VtZW50LCBLVVJMIGNvbnN0JiB1cmwsIFN0cmluZyBjb25zdCYgdmFsdWUpCiAK IGJvb2wgY29va2llc0VuYWJsZWQoRG9jdW1lbnQgY29uc3QqKQogewotICAgIC8vIEZJWE1FLiBD dXJyZW50bHkgY29va2llIGlzIGVuYWJsZWQgYnkgZGVmYXVsdCwgbm8gc2V0dGluZyBvbiBwcm9w ZXJ0eSBwYWdlLgotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBCbGFja0JlcnJ5OjpXZWJL aXQ6OldlYlNldHRpbmdzOjpzdGFuZGFyZFNldHRpbmdzKCktPmFyZUNvb2tpZXNFbmFibGVkKCk7 CiB9CiAKIGJvb2wgZ2V0UmF3Q29va2llcyhjb25zdCBEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0 IEtVUkwmIHVybCwgVmVjdG9yPENvb2tpZT4mIHJhd0Nvb2tpZXMpCkBAIC05OCwxMCArODUsNyBA QCBTdHJpbmcgY29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFsdWUoY29uc3QgRG9jdW1lbnQqIGRv Y3VtZW50LCBjb25zdCBLVVJMICZ1cmwpCiB7CiAgICAgQVNTRVJUKGRvY3VtZW50KTsKIAotICAg IGlmICghKGRvY3VtZW50LT5mcmFtZSgpICYmIGRvY3VtZW50LT5mcmFtZSgpLT5sb2FkZXIoKSAm JiBkb2N1bWVudC0+ZnJhbWUoKS0+bG9hZGVyKCktPmNsaWVudCgpKSkKLSAgICAgICAgcmV0dXJu IFN0cmluZygpOwotCi0gICAgaWYgKCFzdGF0aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudEJsYWNr QmVycnkqPihkb2N1bWVudC0+ZnJhbWUoKS0+bG9hZGVyKCktPmNsaWVudCgpKS0+Y29va2llc0Vu YWJsZWQoKSkKKyAgICBpZiAoIWNvb2tpZXNFbmFibGVkKGRvY3VtZW50KSkKICAgICAgICAgcmV0 dXJuIFN0cmluZygpOwogCiAgICAgcmV0dXJuIGNvb2tpZU1hbmFnZXIoKS5nZXRDb29raWUodXJs LCBXaXRoSHR0cE9ubHlDb29raWVzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAppbmRleCA2MGNjODZjM2Yy MDllNTdiNWEyNWEyNmY4ZmJlOTNhNzBjMjVjMmQ4Li41NTI3OGI4OTBhZTY5ZWRkYjkxMjk0YmVl NzZhMmRkNDY0MDlkYzYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCkBAIC0yMSw2ICsyMSw3IEBACiAK ICNpbmNsdWRlICJBYm91dERhdGEuaCIKICNpbmNsdWRlICJCYXNlNjQuaCIKKyNpbmNsdWRlICJD b29raWVKYXIuaCIKICNpbmNsdWRlICJDb29raWVNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiQ3JlZGVu dGlhbFN0b3JhZ2UuaCIKICNpbmNsdWRlICJGcmFtZS5oIgpAQCAtMzA3LDggKzMwOCw3IEBAIHZv aWQgTmV0d29ya0pvYjo6aGFuZGxlTm90aWZ5SGVhZGVyUmVjZWl2ZWQoY29uc3QgU3RyaW5nJiBr ZXksIGNvbnN0IFN0cmluZyYgdmFsCiAgICAgICAgIG1fY29udGVudERpc3Bvc2l0aW9uID0gdmFs dWU7CiAKICAgICBpZiAobG93ZXJLZXkgPT0gInNldC1jb29raWUiKSB7Ci0gICAgICAgIGlmICht X2ZyYW1lICYmIG1fZnJhbWUtPmxvYWRlcigpICYmIG1fZnJhbWUtPmxvYWRlcigpLT5jbGllbnQo KQotICAgICAgICAgICAgJiYgc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5 Kj4obV9mcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpKS0+Y29va2llc0VuYWJsZWQoKSkKKyAgICAg ICAgaWYgKG1fZnJhbWUgJiYgY29va2llc0VuYWJsZWQobV9mcmFtZS0+ZG9jdW1lbnQoKSkpCiAg ICAgICAgICAgICBoYW5kbGVTZXRDb29raWVIZWFkZXIodmFsdWUpOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtN YW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9O ZXR3b3JrTWFuYWdlci5jcHAKaW5kZXggZTM4MzJlOTMzZjkzMGFmODY4ZGFlNTY1ZmQ3NjlhYzBm ZDZkYTk3Yi4uN2Q1ZjIwYmUyYTMyZWZkNmQ3Yjc1OWJmZmRiODFhZTYwNDhmMTljMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtN YW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVy cnkvTmV0d29ya01hbmFnZXIuY3BwCkBAIC0yMCw5ICsyMCw5IEBACiAjaW5jbHVkZSAiTmV0d29y a01hbmFnZXIuaCIKIAogI2luY2x1ZGUgIkNocm9tZS5oIgorI2luY2x1ZGUgIkNvb2tpZUphci5o IgogI2luY2x1ZGUgIkNyZWRlbnRpYWxTdG9yYWdlLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKLSNp bmNsdWRlICJGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuaCIKICNpbmNsdWRlICJOZXR3b3Jr Sm9iLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlJlc291cmNlSGFuZGxlSW50ZXJu YWwuaCIKQEAgLTcyLDcgKzcyLDcgQEAgYm9vbCBOZXR3b3JrTWFuYWdlcjo6c3RhcnRKb2IoaW50 IHBsYXllcklkLCBjb25zdCBTdHJpbmcmIHBhZ2VHcm91cE5hbWUsIFBhc3NSZWYKICAgICAgICAg bV9pbml0aWFsVVJMID0gS1VSTCgpOwogCiAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdv cmtSZXF1ZXN0IHBsYXRmb3JtUmVxdWVzdDsKLSAgICByZXF1ZXN0LmluaXRpYWxpemVQbGF0Zm9y bVJlcXVlc3QocGxhdGZvcm1SZXF1ZXN0LCBmcmFtZS5sb2FkZXIoKSAmJiBmcmFtZS5sb2FkZXIo KS0+Y2xpZW50KCkgJiYgc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Kj4o ZnJhbWUubG9hZGVyKCktPmNsaWVudCgpKS0+Y29va2llc0VuYWJsZWQoKSwgaXNJbml0aWFsLCBy ZWRpcmVjdENvdW50KTsKKyAgICByZXF1ZXN0LmluaXRpYWxpemVQbGF0Zm9ybVJlcXVlc3QocGxh dGZvcm1SZXF1ZXN0LCBjb29raWVzRW5hYmxlZChmcmFtZS5kb2N1bWVudCgpKSwgaXNJbml0aWFs LCByZWRpcmVjdENvdW50KTsKIAogICAgIC8vIEF0dGFjaCBhbnkgYXBwbGljYWJsZSBhdXRoIGNy ZWRlbnRpYWxzIHRvIHRoZSBOZXR3b3JrUmVxdWVzdC4KICAgICBBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZSYgY2hhbGxlbmdlID0gZ3VhcmRKb2ItPmdldEludGVybmFsKCktPm1fY3VycmVudFdlYkNo YWxsZW5nZTsK