211544 2020-05-06 19:00:55 -0700 Add some missing null checks for DocumentLoader 2020-05-07 11:56:15 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 darin darin andersca beidson cdumez ews-watchlist japhet webkit-bug-importer oldest_to_newest 1649926 0 darin 2020-05-06 19:00:55 -0700 Add some missing null checks for DocumentLoader 1649927 1 398696 darin 2020-05-06 19:02:14 -0700 Created attachment 398696 Patch 1649928 2 darin 2020-05-06 19:03:04 -0700 rdar://62843516 1650089 3 398696 andersca 2020-05-07 07:33:15 -0700 Comment on attachment 398696 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398696&action=review > Source/WebCore/loader/FrameLoader.cpp:2173 > + auto dl = m_documentLoader; I would have renamed this to documentLoader. > Source/WebCore/loader/FrameLoader.cpp:2226 > + m_documentLoader->writer().setMIMEType(dl->responseMIMEType()); Should this use dl instead of m_documentLoader? (Maybe there's a chance that m_documentLoader is replaced mid-function?) > Source/WebCore/loader/HistoryController.cpp:417 > + const URL& historyURL = m_frame.loader().documentLoader() ? m_frame.loader().documentLoader()->urlForHistory() : URL { }; I'd change this to no longer hold a const reference, since urlForHistory() returns a const&, it will always be copied anyway AFAICT. 1650117 4 398696 darin 2020-05-07 08:44:24 -0700 Comment on attachment 398696 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398696&action=review >> Source/WebCore/loader/FrameLoader.cpp:2173 >> + auto dl = m_documentLoader; > > I would have renamed this to documentLoader. OK, I’ll do that. >> Source/WebCore/loader/FrameLoader.cpp:2226 >> + m_documentLoader->writer().setMIMEType(dl->responseMIMEType()); > > Should this use dl instead of m_documentLoader? (Maybe there's a chance that m_documentLoader is replaced mid-function?) I thought the point was to set the MIME type on the new writer with the possibly-old loader’s MIME type. Not really sure. >> Source/WebCore/loader/HistoryController.cpp:417 >> + const URL& historyURL = m_frame.loader().documentLoader() ? m_frame.loader().documentLoader()->urlForHistory() : URL { }; > > I'd change this to no longer hold a const reference, since urlForHistory() returns a const&, it will always be copied anyway AFAICT. Will do. 1650166 5 398751 darin 2020-05-07 10:07:24 -0700 Created attachment 398751 Patch 1650167 6 398751 darin 2020-05-07 10:07:46 -0700 Comment on attachment 398751 Patch I plan to land this later with the commit queue. 1650168 7 398752 darin 2020-05-07 10:10:29 -0700 Created attachment 398752 Patch 1650260 8 ews-feeder 2020-05-07 11:55:55 -0700 Committed r261323: <https://trac.webkit.org/changeset/261323> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398752. 1650261 9 webkit-bug-importer 2020-05-07 11:56:15 -0700 <rdar://problem/62986860> 398696 2020-05-06 19:02:14 -0700 2020-05-07 07:33:15 -0700 Patch bug-211544-20200506190213.patch text/plain 5715 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMjYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQyZmQ0ZmFkYTAxYTkw ZmRhMWE0OWFjMmUyOTE1ZDJlYmU1ZjM0NC4uNWM4OTZhZjdiYTlhODU0Mjg1N2VhN2M3NDEwNzhi ODk2OTE1NjFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA1LTA2ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc29tZSBtaXNzaW5nIG51 bGwgY2hlY2tzIGZvciBEb2N1bWVudExvYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExNTQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCk6IFVzZSBzb21lIG1v cmUgUmVmUHRyLAorICAgICAgICBhbmQgY2hlY2sgZm9yIG51bGwgYmVmb3JlIGNhbGxpbmcgRG9j dW1lbnRMb2FkZXI6OnJlc3BvbnNlTUlNRVR5cGUuCisKKyAgICAgICAgKiBsb2FkZXIvSGlzdG9y eUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6Okhpc3RvcnlD b250cm9sbGVyOjp1cGRhdGVGb3JSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3QpOgor ICAgICAgICBBZGQgY2hlY2tzIGZvciBudWxsIGJlZm9yZSBjYWxsaW5nIHVybEZvckhpc3Rvcnkg YW5kIGlzQ2xpZW50UmVkaXJlY3QuCisKIDIwMjAtMDUtMDYgIFphbGFuIEJ1anRhcyAgPHphbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29udGVudE9ic2VydmF0aW9uXSBTaHV0dGVyc3RvY2sg c2VhcmNoIGJhciBpcyBub3QgYWN0aXZhdGVkIG9uIHRoZSBmaXJzdCB0YXAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg OTI3ZTg1NDVhYzIzZDI1Y2MyNTU4ZDFkZjAzN2YyNmQyMjNlZGQ3Yi4uZWEzZWU4ZjlkYTc5MjZh NDU1NjI0NTI2ZmI3NDhlM2ZlMjU1MDFjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAy MC0wNS0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHNv bWUgbWlzc2luZyBudWxsIGNoZWNrcyBmb3IgRG9jdW1lbnRMb2FkZXIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTU0NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1l TG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKToKKyAgICAgICAg QWRkIGEgbnVsbCBjaGVjayBiZWZvcmUgY2FsbGluZyBEb2N1bWVudExvYWRlcjo6cmVzcG9uc2Uu CisKIDIwMjAtMDUtMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbQ29udGVudE9ic2VydmF0aW9uXSBTaHV0dGVyc3RvY2sgc2VhcmNoIGJhciBpcyBub3QgYWN0 aXZhdGVkIG9uIHRoZSBmaXJzdCB0YXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CmluZGV4IDJlNzlhMTMwOWMzZDA1Yjg5ZTY5MDgxNzNmYmY2MmJjYTUxNzBiMGEuLjY0YjZhYTcy YmU1NGUwZmQ5YjAwZDQ1NGM5ODE4ZWFjNmRjNmYzZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcApAQCAtMjE0Niw3ICsyMTQ2LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6dHJh bnNpdGlvblRvQ29tbWl0dGVkKENhY2hlZFBhZ2UqIGNhY2hlZFBhZ2UpCiAgICAgLy8gVGhlIGNh bGwgdG8gY2xvc2VVUkwoKSBpbnZva2VzIHRoZSB1bmxvYWQgZXZlbnQgaGFuZGxlciwgd2hpY2gg Y2FuIGV4ZWN1dGUgYXJiaXRyYXJ5CiAgICAgLy8gSmF2YVNjcmlwdC4gSWYgdGhlIHNjcmlwdCBp bml0aWF0ZXMgYSBuZXcgbG9hZCwgd2UgbmVlZCB0byBhYmFuZG9uIHRoZSBjdXJyZW50IGxvYWQs CiAgICAgLy8gb3IgdGhlIHR3byB3aWxsIHN0b21wIGVhY2ggb3RoZXIuCi0gICAgRG9jdW1lbnRM b2FkZXIqIHBkbCA9IG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci5nZXQoKTsKKyAgICBhdXRv IHBkbCA9IG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcjsKICAgICBpZiAobV9kb2N1bWVudExv YWRlcikKICAgICAgICAgY2xvc2VVUkwoKTsKICAgICBpZiAocGRsICE9IG1fcHJvdmlzaW9uYWxE b2N1bWVudExvYWRlcikKQEAgLTIxNzAsNyArMjE3MCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRy YW5zaXRpb25Ub0NvbW1pdHRlZChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlKQogICAgIHNldFN0YXRl KEZyYW1lU3RhdGVDb21taXR0ZWRQYWdlKTsKIAogICAgIC8vIEhhbmRsZSBhZGRpbmcgdGhlIFVS TCB0byB0aGUgYmFjay9mb3J3YXJkIGxpc3QuCi0gICAgRG9jdW1lbnRMb2FkZXIqIGRsID0gbV9k b2N1bWVudExvYWRlci5nZXQoKTsKKyAgICBhdXRvIGRsID0gbV9kb2N1bWVudExvYWRlcjsKIAog ICAgIHN3aXRjaCAobV9sb2FkVHlwZSkgewogICAgIGNhc2UgRnJhbWVMb2FkVHlwZTo6Rm9yd2Fy ZDoKQEAgLTIyMjIsNyArMjIyMiw4IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0Nv bW1pdHRlZChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlKQogICAgICAgICBicmVhazsKICAgICB9CiAK LSAgICBtX2RvY3VtZW50TG9hZGVyLT53cml0ZXIoKS5zZXRNSU1FVHlwZShkbC0+cmVzcG9uc2VN SU1FVHlwZSgpKTsKKyAgICBpZiAoZGwpCisgICAgICAgIG1fZG9jdW1lbnRMb2FkZXItPndyaXRl cigpLnNldE1JTUVUeXBlKGRsLT5yZXNwb25zZU1JTUVUeXBlKCkpOwogCiAgICAgLy8gVGVsbCB0 aGUgY2xpZW50IHdlJ3ZlIGNvbW1pdHRlZCB0aGlzIFVSTC4KICAgICBBU1NFUlQobV9mcmFtZS52 aWV3KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9s bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKaW5k ZXggNzZiMzg2NDJkYjJhNzMwMjFiNTJkMjBjOTdhOTI0NjdkYzI5YmNmMS4uMzYzODBjZjY5Nzhj YzVjYTA1ZDY1NmY3YmEyNGQ4OGI2ZTU0MTI3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv SGlzdG9yeUNvbnRyb2xsZXIuY3BwCkBAIC00MTQsOSArNDE0LDkgQEAgdm9pZCBGcmFtZUxvYWRl cjo6SGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUZvclJlZGlyZWN0V2l0aExvY2tlZEJhY2tGb3J3 YXJkTGlzdCgKICAgICBMT0coSGlzdG9yeSwgIkhpc3RvcnlDb250cm9sbGVyICVwIHVwZGF0ZUZv clJlZGlyZWN0V2l0aExvY2tlZEJhY2tGb3J3YXJkTGlzdDogVXBkYXRpbmcgSGlzdG9yeSBmb3Ig cmVkaXJlY3QgbG9hZCBpbiBmcmFtZSAlcCAobWFpbiBmcmFtZSAlZCkgJXMiLCB0aGlzLCAmbV9m cmFtZSwgbV9mcmFtZS5pc01haW5GcmFtZSgpLCBtX2ZyYW1lLmxvYWRlcigpLmRvY3VtZW50TG9h ZGVyKCkgPyBtX2ZyYW1lLmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCktPnVybCgpLnN0cmluZygp LnV0ZjgoKS5kYXRhKCkgOiAiIik7CiAgICAgCiAgICAgYm9vbCB1c2VzRXBoZW1lcmFsU2Vzc2lv biA9IG1fZnJhbWUucGFnZSgpID8gbV9mcmFtZS5wYWdlKCktPnVzZXNFcGhlbWVyYWxTZXNzaW9u KCkgOiB0cnVlOwotICAgIGNvbnN0IFVSTCYgaGlzdG9yeVVSTCA9IG1fZnJhbWUubG9hZGVyKCku ZG9jdW1lbnRMb2FkZXIoKS0+dXJsRm9ySGlzdG9yeSgpOworICAgIGNvbnN0IFVSTCYgaGlzdG9y eVVSTCA9IG1fZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKSA/IG1fZnJhbWUubG9hZGVy KCkuZG9jdW1lbnRMb2FkZXIoKS0+dXJsRm9ySGlzdG9yeSgpIDogVVJMIHsgfTsKIAotICAgIGlm IChtX2ZyYW1lLmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCktPmlzQ2xpZW50UmVkaXJlY3QoKSkg eworICAgIGlmIChtX2ZyYW1lLmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkgJiYgbV9mcmFtZS5s b2FkZXIoKS5kb2N1bWVudExvYWRlcigpLT5pc0NsaWVudFJlZGlyZWN0KCkpIHsKICAgICAgICAg aWYgKCFtX2N1cnJlbnRJdGVtICYmICFtX2ZyYW1lLnRyZWUoKS5wYXJlbnQoKSkgewogICAgICAg ICAgICAgaWYgKCFoaXN0b3J5VVJMLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgICAgIHVwZGF0 ZUJhY2tGb3J3YXJkTGlzdENsaXBwZWRBdFRhcmdldCh0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwCmluZGV4IDQ4ZWE0NjgyYzA5NDVhNDA5MDgxYWIwMTgxNDFlODY1M2VlZGJk YTcuLmU0NmRhMGUwYTU4MDc5MTBmNGU0ZDJmNmZjNGU5MzE4NTA1NjdhZmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs aWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtMTQ4Nyw4ICsxNDg3LDkgQEAgdm9pZCBXZWJGcmFt ZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSgpCiAgICAgICAg IHNob3VsZEhpZGVTY3JvbGxiYXJzID0gdHJ1ZTsKICNlbmRpZgogCi0gICAgY29uc3QgUmVzb3Vy Y2VSZXNwb25zZSYgcmVzcG9uc2UgPSBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuZG9j dW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKTsKLSAgICBtX2ZyYW1lSGFzQ3VzdG9tQ29udGVudFBy b3ZpZGVyID0gaXNNYWluRnJhbWUgJiYgd2ViUGFnZS0+c2hvdWxkVXNlQ3VzdG9tQ29udGVudFBy b3ZpZGVyRm9yUmVzcG9uc2UocmVzcG9uc2UpOworICAgIG1fZnJhbWVIYXNDdXN0b21Db250ZW50 UHJvdmlkZXIgPSBpc01haW5GcmFtZQorICAgICAgICAmJiBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+ bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKQorICAgICAgICAmJiB3ZWJQYWdlLT5zaG91bGRVc2VD dXN0b21Db250ZW50UHJvdmlkZXJGb3JSZXNwb25zZShtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9h ZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKSk7CiAgICAgbV9mcmFtZUNhbWVGcm9t QmFja0ZvcndhcmRDYWNoZSA9IGZhbHNlOwogCiAgICAgU2Nyb2xsYmFyTW9kZSBkZWZhdWx0U2Ny b2xsYmFyTW9kZSA9IHNob3VsZEhpZGVTY3JvbGxiYXJzID8gU2Nyb2xsYmFyQWx3YXlzT2ZmIDog U2Nyb2xsYmFyQXV0bzsK 398751 2020-05-07 10:07:24 -0700 2020-05-07 10:10:43 -0700 Patch bug-211544-20200507100723.patch text/plain 7575 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjkyZjhkYjM5NDBkNmI1 ZjkwMTk3YjM5ZTAyYzlmMmE1ODg5YTczNi4uYTlkMzNkMzZjZTNhZDU3OGY5YTI5ZDY5ZjM4NWU0 NzhiM2EyYTUxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA1LTA2ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc29tZSBtaXNzaW5nIG51 bGwgY2hlY2tzIGZvciBEb2N1bWVudExvYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExNTQ0CisgICAgICAgIHJkYXI6Ly82Mjg0MzUxNgorCisg ICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KKworICAgICAgICAqIGxvYWRlci9G cmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6dHJhbnNpdGlv blRvQ29tbWl0dGVkKTogVXNlIHNvbWUgbW9yZSBSZWZQdHIsCisgICAgICAgIGFuZCBjaGVjayBm b3IgbnVsbCBiZWZvcmUgY2FsbGluZyBEb2N1bWVudExvYWRlcjo6cmVzcG9uc2VNSU1FVHlwZS4K KyAgICAgICAgQWxzbyByZW1vdmVkIGEgY29tbWVudCB0aGF0IG1hZGUgbm8gc2Vuc2UsIGFuZCBh biBhc3NlcnRpb24gdGhhdCB3YXMKKyAgICAgICAgdGhlcmUgZm9yIG5vIHJlYXNvbiwgbGVmdCBv dmVyIGZyb20gc29tZSBwb2ludCBpbiBoaXN0b3J5IHdoZXJlIGl0CisgICAgICAgIG1hZGUgc2Vu c2UuCisKKyAgICAgICAgKiBsb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXI6Okhpc3RvcnlDb250cm9sbGVyOjp1cGRhdGVGb3JSZWRpcmVj dFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3QpOgorICAgICAgICBBZGQgY2hlY2tzIGZvciBudWxs IGJlZm9yZSBjYWxsaW5nIHVybEZvckhpc3RvcnkgYW5kIGlzQ2xpZW50UmVkaXJlY3QuCisKIDIw MjAtMDUtMDYgIFlvc2hpYWtpIEppdHN1a2F3YSAgPHlvc2hpYWtpLmppdHN1a2F3YUBzb255LmNv bT4gYW5kIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAg ICAgW1dpbl0gSW1wbGVtZW50IERpc3BsYXlSZWZyZXNoTW9uaXRvciBieSB1c2luZyBSdW5Mb29w OjpUaW1lcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwppbmRleCAzZmQ2N2Y0M2FhOTlhOTYwNTc3YWZjYmJhYmEwZGQ3NDliZDdl YTAxLi42NWM3ZGI0MmYyZjRkMzRlNTY1Mzc2OTBkZjFjMTEwYTU4MjA5MGQxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDIwLTA1LTA2ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNv bT4KKworICAgICAgICBBZGQgc29tZSBtaXNzaW5nIG51bGwgY2hlY2tzIGZvciBEb2N1bWVudExv YWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEx NTQ0CisgICAgICAgIHJkYXI6Ly82Mjg0MzUxNgorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZGVy cyBDYXJsc3Nvbi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVu dDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSk6CisgICAgICAgIEFkZCBhIG51bGwg Y2hlY2sgYmVmb3JlIGNhbGxpbmcgRG9jdW1lbnRMb2FkZXI6OnJlc3BvbnNlLgorCiAyMDIwLTA1 LTA2ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBV bnJldmlld2VkLCByZXZlcnRpbmcgcjI2MDY4OS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXIuY3BwCmluZGV4IDJlNzlhMTMwOWMzZDA1Yjg5ZTY5MDgxNzNmYmY2MmJjYTUxNzBiMGEuLmQy ZTUxZDg2ZDdlNDE0ZGNhNjVmNDIxZGU2Y2QxNzM0MDFiZTdiMDUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjE0NiwxMCArMjE0NiwxMCBAQCB2b2lkIEZyYW1lTG9h ZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQoQ2FjaGVkUGFnZSogY2FjaGVkUGFnZSkKICAgICAv LyBUaGUgY2FsbCB0byBjbG9zZVVSTCgpIGludm9rZXMgdGhlIHVubG9hZCBldmVudCBoYW5kbGVy LCB3aGljaCBjYW4gZXhlY3V0ZSBhcmJpdHJhcnkKICAgICAvLyBKYXZhU2NyaXB0LiBJZiB0aGUg c2NyaXB0IGluaXRpYXRlcyBhIG5ldyBsb2FkLCB3ZSBuZWVkIHRvIGFiYW5kb24gdGhlIGN1cnJl bnQgbG9hZCwKICAgICAvLyBvciB0aGUgdHdvIHdpbGwgc3RvbXAgZWFjaCBvdGhlci4KLSAgICBE b2N1bWVudExvYWRlciogcGRsID0gbV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyLmdldCgpOwor ICAgIGF1dG8gb3JpZ2luYWxQcm92aXNpb25hbERvY3VtZW50TG9hZGVyID0gbV9wcm92aXNpb25h bERvY3VtZW50TG9hZGVyOwogICAgIGlmIChtX2RvY3VtZW50TG9hZGVyKQogICAgICAgICBjbG9z ZVVSTCgpOwotICAgIGlmIChwZGwgIT0gbV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKQorICAg IGlmIChvcmlnaW5hbFByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIgIT0gbV9wcm92aXNpb25hbERv Y3VtZW50TG9hZGVyKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAobV9kb2N1bWVudExvYWRl cikKQEAgLTIxNjEsNyArMjE2MSw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0Nv bW1pdHRlZChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlKQogICAgIC8vIFNjcmlwdCBjYW4gZG8gYW55 dGhpbmcuIElmIHRoZSBzY3JpcHQgaW5pdGlhdGVzIGEgbmV3IGxvYWQsIHdlIG5lZWQgdG8gYWJh bmRvbiB0aGUKICAgICAvLyBjdXJyZW50IGxvYWQgb3IgdGhlIHR3byB3aWxsIHN0b21wIGVhY2gg b3RoZXIuCiAgICAgc2V0RG9jdW1lbnRMb2FkZXIobV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVy LmdldCgpKTsKLSAgICBpZiAocGRsICE9IG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcikKKyAg ICBpZiAob3JpZ2luYWxQcm92aXNpb25hbERvY3VtZW50TG9hZGVyICE9IG1fcHJvdmlzaW9uYWxE b2N1bWVudExvYWRlcikKICAgICAgICAgcmV0dXJuOwogICAgIEZSQU1FTE9BREVSX1JFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoUmVzb3VyY2VMb2FkaW5nLCAidHJhbnNpdGlvblRvQ29tbWl0dGVkOiBD bGVhcmluZyBwcm92aXNpb25hbCBkb2N1bWVudCBsb2FkZXIgKG1fcHJvdmlzaW9uYWxEb2N1bWVu dExvYWRlcj0lcCkiLCBtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIuZ2V0KCkpOwogICAgIHNl dFByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIobnVsbHB0cik7CkBAIC0yMTcwLDcgKzIxNzAsNyBA QCB2b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQoQ2FjaGVkUGFnZSogY2Fj aGVkUGFnZSkKICAgICBzZXRTdGF0ZShGcmFtZVN0YXRlQ29tbWl0dGVkUGFnZSk7CiAKICAgICAv LyBIYW5kbGUgYWRkaW5nIHRoZSBVUkwgdG8gdGhlIGJhY2svZm9yd2FyZCBsaXN0LgotICAgIERv Y3VtZW50TG9hZGVyKiBkbCA9IG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCk7CisgICAgYXV0byBkb2N1 bWVudExvYWRlciA9IG1fZG9jdW1lbnRMb2FkZXI7CiAKICAgICBzd2l0Y2ggKG1fbG9hZFR5cGUp IHsKICAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OkZvcndhcmQ6CkBAIC0yMTkxLDkgKzIxOTEsOCBA QCB2b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQoQ2FjaGVkUGFnZSogY2Fj aGVkUGFnZSkKIAogICAgICAgICAgICAgLy8gQ3JlYXRlIGEgZG9jdW1lbnQgdmlldyBmb3IgdGhp cyBkb2N1bWVudCwgb3IgdXNlZCB0aGUgY2FjaGVkIHZpZXcuCiAgICAgICAgICAgICBpZiAoY2Fj aGVkUGFnZSkgewotICAgICAgICAgICAgICAgIERvY3VtZW50TG9hZGVyKiBjYWNoZWREb2N1bWVu dExvYWRlciA9IGNhY2hlZFBhZ2UtPmRvY3VtZW50TG9hZGVyKCk7Ci0gICAgICAgICAgICAgICAg QVNTRVJUKGNhY2hlZERvY3VtZW50TG9hZGVyKTsKLSAgICAgICAgICAgICAgICBjYWNoZWREb2N1 bWVudExvYWRlci0+YXR0YWNoVG9GcmFtZShtX2ZyYW1lKTsKKyAgICAgICAgICAgICAgICBBU1NF UlQoY2FjaGVkUGFnZS0+ZG9jdW1lbnRMb2FkZXIoKSk7CisgICAgICAgICAgICAgICAgY2FjaGVk UGFnZS0+ZG9jdW1lbnRMb2FkZXIoKS0+YXR0YWNoVG9GcmFtZShtX2ZyYW1lKTsKICAgICAgICAg ICAgICAgICBtX2NsaWVudC0+dHJhbnNpdGlvblRvQ29tbWl0dGVkRnJvbUNhY2hlZEZyYW1lKGNh Y2hlZFBhZ2UtPmNhY2hlZE1haW5GcmFtZSgpKTsKICAgICAgICAgICAgIH0gZWxzZQogICAgICAg ICAgICAgICAgIG1fY2xpZW50LT50cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCk7CkBA IC0yMjIyLDEwICsyMjIxLDggQEAgdm9pZCBGcmFtZUxvYWRlcjo6dHJhbnNpdGlvblRvQ29tbWl0 dGVkKENhY2hlZFBhZ2UqIGNhY2hlZFBhZ2UpCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAg IG1fZG9jdW1lbnRMb2FkZXItPndyaXRlcigpLnNldE1JTUVUeXBlKGRsLT5yZXNwb25zZU1JTUVU eXBlKCkpOwotCi0gICAgLy8gVGVsbCB0aGUgY2xpZW50IHdlJ3ZlIGNvbW1pdHRlZCB0aGlzIFVS TC4KLSAgICBBU1NFUlQobV9mcmFtZS52aWV3KCkpOworICAgIGlmIChkb2N1bWVudExvYWRlcikK KyAgICAgICAgZG9jdW1lbnRMb2FkZXItPndyaXRlcigpLnNldE1JTUVUeXBlKGRvY3VtZW50TG9h ZGVyLT5yZXNwb25zZU1JTUVUeXBlKCkpOwogCiAgICAgaWYgKG1fc3RhdGVNYWNoaW5lLmNyZWF0 aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKaW5kZXggNzZiMzg2NDJkYjJhNzMwMjFi NTJkMjBjOTdhOTI0NjdkYzI5YmNmMS4uMzYzODBjZjY5NzhjYzVjYTA1ZDY1NmY3YmEyNGQ4OGI2 ZTU0MTI3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9s bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3Bw CkBAIC00MTQsOSArNDE0LDkgQEAgdm9pZCBGcmFtZUxvYWRlcjo6SGlzdG9yeUNvbnRyb2xsZXI6 OnVwZGF0ZUZvclJlZGlyZWN0V2l0aExvY2tlZEJhY2tGb3J3YXJkTGlzdCgKICAgICBMT0coSGlz dG9yeSwgIkhpc3RvcnlDb250cm9sbGVyICVwIHVwZGF0ZUZvclJlZGlyZWN0V2l0aExvY2tlZEJh Y2tGb3J3YXJkTGlzdDogVXBkYXRpbmcgSGlzdG9yeSBmb3IgcmVkaXJlY3QgbG9hZCBpbiBmcmFt ZSAlcCAobWFpbiBmcmFtZSAlZCkgJXMiLCB0aGlzLCAmbV9mcmFtZSwgbV9mcmFtZS5pc01haW5G cmFtZSgpLCBtX2ZyYW1lLmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkgPyBtX2ZyYW1lLmxvYWRl cigpLmRvY3VtZW50TG9hZGVyKCktPnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkgOiAiIik7 CiAgICAgCiAgICAgYm9vbCB1c2VzRXBoZW1lcmFsU2Vzc2lvbiA9IG1fZnJhbWUucGFnZSgpID8g bV9mcmFtZS5wYWdlKCktPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCkgOiB0cnVlOwotICAgIGNvbnN0 IFVSTCYgaGlzdG9yeVVSTCA9IG1fZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+dXJs Rm9ySGlzdG9yeSgpOworICAgIGNvbnN0IFVSTCYgaGlzdG9yeVVSTCA9IG1fZnJhbWUubG9hZGVy KCkuZG9jdW1lbnRMb2FkZXIoKSA/IG1fZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+ dXJsRm9ySGlzdG9yeSgpIDogVVJMIHsgfTsKIAotICAgIGlmIChtX2ZyYW1lLmxvYWRlcigpLmRv Y3VtZW50TG9hZGVyKCktPmlzQ2xpZW50UmVkaXJlY3QoKSkgeworICAgIGlmIChtX2ZyYW1lLmxv YWRlcigpLmRvY3VtZW50TG9hZGVyKCkgJiYgbV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVudExvYWRl cigpLT5pc0NsaWVudFJlZGlyZWN0KCkpIHsKICAgICAgICAgaWYgKCFtX2N1cnJlbnRJdGVtICYm ICFtX2ZyYW1lLnRyZWUoKS5wYXJlbnQoKSkgewogICAgICAgICAgICAgaWYgKCFoaXN0b3J5VVJM LmlzRW1wdHkoKSkgewogICAgICAgICAgICAgICAgIHVwZGF0ZUJhY2tGb3J3YXJkTGlzdENsaXBw ZWRBdFRhcmdldCh0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDQ4 ZWE0NjgyYzA5NDVhNDA5MDgxYWIwMTgxNDFlODY1M2VlZGJkYTcuLmU0NmRhMGUwYTU4MDc5MTBm NGU0ZDJmNmZjNGU5MzE4NTA1NjdhZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cApAQCAtMTQ4Nyw4ICsxNDg3LDkgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNp dGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSgpCiAgICAgICAgIHNob3VsZEhpZGVTY3JvbGxiYXJz ID0gdHJ1ZTsKICNlbmRpZgogCi0gICAgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2Ug PSBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9u c2UoKTsKLSAgICBtX2ZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyID0gaXNNYWluRnJhbWUg JiYgd2ViUGFnZS0+c2hvdWxkVXNlQ3VzdG9tQ29udGVudFByb3ZpZGVyRm9yUmVzcG9uc2UocmVz cG9uc2UpOworICAgIG1fZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIgPSBpc01haW5GcmFt ZQorICAgICAgICAmJiBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2Fk ZXIoKQorICAgICAgICAmJiB3ZWJQYWdlLT5zaG91bGRVc2VDdXN0b21Db250ZW50UHJvdmlkZXJG b3JSZXNwb25zZShtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIo KS0+cmVzcG9uc2UoKSk7CiAgICAgbV9mcmFtZUNhbWVGcm9tQmFja0ZvcndhcmRDYWNoZSA9IGZh bHNlOwogCiAgICAgU2Nyb2xsYmFyTW9kZSBkZWZhdWx0U2Nyb2xsYmFyTW9kZSA9IHNob3VsZEhp ZGVTY3JvbGxiYXJzID8gU2Nyb2xsYmFyQWx3YXlzT2ZmIDogU2Nyb2xsYmFyQXV0bzsK 398752 2020-05-07 10:10:29 -0700 2020-05-07 11:55:56 -0700 Patch bug-211544-20200507101028.patch text/plain 7569 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjkyZjhkYjM5NDBkNmI1 ZjkwMTk3YjM5ZTAyYzlmMmE1ODg5YTczNi4uYTlkMzNkMzZjZTNhZDU3OGY5YTI5ZDY5ZjM4NWU0 NzhiM2EyYTUxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA1LTA2ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc29tZSBtaXNzaW5nIG51 bGwgY2hlY2tzIGZvciBEb2N1bWVudExvYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExNTQ0CisgICAgICAgIHJkYXI6Ly82Mjg0MzUxNgorCisg ICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KKworICAgICAgICAqIGxvYWRlci9G cmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6dHJhbnNpdGlv blRvQ29tbWl0dGVkKTogVXNlIHNvbWUgbW9yZSBSZWZQdHIsCisgICAgICAgIGFuZCBjaGVjayBm b3IgbnVsbCBiZWZvcmUgY2FsbGluZyBEb2N1bWVudExvYWRlcjo6cmVzcG9uc2VNSU1FVHlwZS4K KyAgICAgICAgQWxzbyByZW1vdmVkIGEgY29tbWVudCB0aGF0IG1hZGUgbm8gc2Vuc2UsIGFuZCBh biBhc3NlcnRpb24gdGhhdCB3YXMKKyAgICAgICAgdGhlcmUgZm9yIG5vIHJlYXNvbiwgbGVmdCBv dmVyIGZyb20gc29tZSBwb2ludCBpbiBoaXN0b3J5IHdoZXJlIGl0CisgICAgICAgIG1hZGUgc2Vu c2UuCisKKyAgICAgICAgKiBsb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXI6Okhpc3RvcnlDb250cm9sbGVyOjp1cGRhdGVGb3JSZWRpcmVj dFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3QpOgorICAgICAgICBBZGQgY2hlY2tzIGZvciBudWxs IGJlZm9yZSBjYWxsaW5nIHVybEZvckhpc3RvcnkgYW5kIGlzQ2xpZW50UmVkaXJlY3QuCisKIDIw MjAtMDUtMDYgIFlvc2hpYWtpIEppdHN1a2F3YSAgPHlvc2hpYWtpLmppdHN1a2F3YUBzb255LmNv bT4gYW5kIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAg ICAgW1dpbl0gSW1wbGVtZW50IERpc3BsYXlSZWZyZXNoTW9uaXRvciBieSB1c2luZyBSdW5Mb29w OjpUaW1lcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwppbmRleCAzZmQ2N2Y0M2FhOTlhOTYwNTc3YWZjYmJhYmEwZGQ3NDliZDdl YTAxLi42NWM3ZGI0MmYyZjRkMzRlNTY1Mzc2OTBkZjFjMTEwYTU4MjA5MGQxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDIwLTA1LTA2ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNv bT4KKworICAgICAgICBBZGQgc29tZSBtaXNzaW5nIG51bGwgY2hlY2tzIGZvciBEb2N1bWVudExv YWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEx NTQ0CisgICAgICAgIHJkYXI6Ly82Mjg0MzUxNgorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZGVy cyBDYXJsc3Nvbi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVu dDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSk6CisgICAgICAgIEFkZCBhIG51bGwg Y2hlY2sgYmVmb3JlIGNhbGxpbmcgRG9jdW1lbnRMb2FkZXI6OnJlc3BvbnNlLgorCiAyMDIwLTA1 LTA2ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBV bnJldmlld2VkLCByZXZlcnRpbmcgcjI2MDY4OS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXIuY3BwCmluZGV4IDJlNzlhMTMwOWMzZDA1Yjg5ZTY5MDgxNzNmYmY2MmJjYTUxNzBiMGEuLmQy ZTUxZDg2ZDdlNDE0ZGNhNjVmNDIxZGU2Y2QxNzM0MDFiZTdiMDUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjE0NiwxMCArMjE0NiwxMCBAQCB2b2lkIEZyYW1lTG9h ZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQoQ2FjaGVkUGFnZSogY2FjaGVkUGFnZSkKICAgICAv LyBUaGUgY2FsbCB0byBjbG9zZVVSTCgpIGludm9rZXMgdGhlIHVubG9hZCBldmVudCBoYW5kbGVy LCB3aGljaCBjYW4gZXhlY3V0ZSBhcmJpdHJhcnkKICAgICAvLyBKYXZhU2NyaXB0LiBJZiB0aGUg c2NyaXB0IGluaXRpYXRlcyBhIG5ldyBsb2FkLCB3ZSBuZWVkIHRvIGFiYW5kb24gdGhlIGN1cnJl bnQgbG9hZCwKICAgICAvLyBvciB0aGUgdHdvIHdpbGwgc3RvbXAgZWFjaCBvdGhlci4KLSAgICBE b2N1bWVudExvYWRlciogcGRsID0gbV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyLmdldCgpOwor ICAgIGF1dG8gb3JpZ2luYWxQcm92aXNpb25hbERvY3VtZW50TG9hZGVyID0gbV9wcm92aXNpb25h bERvY3VtZW50TG9hZGVyOwogICAgIGlmIChtX2RvY3VtZW50TG9hZGVyKQogICAgICAgICBjbG9z ZVVSTCgpOwotICAgIGlmIChwZGwgIT0gbV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKQorICAg IGlmIChvcmlnaW5hbFByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIgIT0gbV9wcm92aXNpb25hbERv Y3VtZW50TG9hZGVyKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAobV9kb2N1bWVudExvYWRl cikKQEAgLTIxNjEsNyArMjE2MSw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0Nv bW1pdHRlZChDYWNoZWRQYWdlKiBjYWNoZWRQYWdlKQogICAgIC8vIFNjcmlwdCBjYW4gZG8gYW55 dGhpbmcuIElmIHRoZSBzY3JpcHQgaW5pdGlhdGVzIGEgbmV3IGxvYWQsIHdlIG5lZWQgdG8gYWJh bmRvbiB0aGUKICAgICAvLyBjdXJyZW50IGxvYWQgb3IgdGhlIHR3byB3aWxsIHN0b21wIGVhY2gg b3RoZXIuCiAgICAgc2V0RG9jdW1lbnRMb2FkZXIobV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVy LmdldCgpKTsKLSAgICBpZiAocGRsICE9IG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcikKKyAg ICBpZiAob3JpZ2luYWxQcm92aXNpb25hbERvY3VtZW50TG9hZGVyICE9IG1fcHJvdmlzaW9uYWxE b2N1bWVudExvYWRlcikKICAgICAgICAgcmV0dXJuOwogICAgIEZSQU1FTE9BREVSX1JFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoUmVzb3VyY2VMb2FkaW5nLCAidHJhbnNpdGlvblRvQ29tbWl0dGVkOiBD bGVhcmluZyBwcm92aXNpb25hbCBkb2N1bWVudCBsb2FkZXIgKG1fcHJvdmlzaW9uYWxEb2N1bWVu dExvYWRlcj0lcCkiLCBtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIuZ2V0KCkpOwogICAgIHNl dFByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIobnVsbHB0cik7CkBAIC0yMTcwLDcgKzIxNzAsNyBA QCB2b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQoQ2FjaGVkUGFnZSogY2Fj aGVkUGFnZSkKICAgICBzZXRTdGF0ZShGcmFtZVN0YXRlQ29tbWl0dGVkUGFnZSk7CiAKICAgICAv LyBIYW5kbGUgYWRkaW5nIHRoZSBVUkwgdG8gdGhlIGJhY2svZm9yd2FyZCBsaXN0LgotICAgIERv Y3VtZW50TG9hZGVyKiBkbCA9IG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCk7CisgICAgYXV0byBkb2N1 bWVudExvYWRlciA9IG1fZG9jdW1lbnRMb2FkZXI7CiAKICAgICBzd2l0Y2ggKG1fbG9hZFR5cGUp IHsKICAgICBjYXNlIEZyYW1lTG9hZFR5cGU6OkZvcndhcmQ6CkBAIC0yMTkxLDkgKzIxOTEsOCBA QCB2b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQoQ2FjaGVkUGFnZSogY2Fj aGVkUGFnZSkKIAogICAgICAgICAgICAgLy8gQ3JlYXRlIGEgZG9jdW1lbnQgdmlldyBmb3IgdGhp cyBkb2N1bWVudCwgb3IgdXNlZCB0aGUgY2FjaGVkIHZpZXcuCiAgICAgICAgICAgICBpZiAoY2Fj aGVkUGFnZSkgewotICAgICAgICAgICAgICAgIERvY3VtZW50TG9hZGVyKiBjYWNoZWREb2N1bWVu dExvYWRlciA9IGNhY2hlZFBhZ2UtPmRvY3VtZW50TG9hZGVyKCk7Ci0gICAgICAgICAgICAgICAg QVNTRVJUKGNhY2hlZERvY3VtZW50TG9hZGVyKTsKLSAgICAgICAgICAgICAgICBjYWNoZWREb2N1 bWVudExvYWRlci0+YXR0YWNoVG9GcmFtZShtX2ZyYW1lKTsKKyAgICAgICAgICAgICAgICBBU1NF UlQoY2FjaGVkUGFnZS0+ZG9jdW1lbnRMb2FkZXIoKSk7CisgICAgICAgICAgICAgICAgY2FjaGVk UGFnZS0+ZG9jdW1lbnRMb2FkZXIoKS0+YXR0YWNoVG9GcmFtZShtX2ZyYW1lKTsKICAgICAgICAg ICAgICAgICBtX2NsaWVudC0+dHJhbnNpdGlvblRvQ29tbWl0dGVkRnJvbUNhY2hlZEZyYW1lKGNh Y2hlZFBhZ2UtPmNhY2hlZE1haW5GcmFtZSgpKTsKICAgICAgICAgICAgIH0gZWxzZQogICAgICAg ICAgICAgICAgIG1fY2xpZW50LT50cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCk7CkBA IC0yMjIyLDEwICsyMjIxLDggQEAgdm9pZCBGcmFtZUxvYWRlcjo6dHJhbnNpdGlvblRvQ29tbWl0 dGVkKENhY2hlZFBhZ2UqIGNhY2hlZFBhZ2UpCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAg IG1fZG9jdW1lbnRMb2FkZXItPndyaXRlcigpLnNldE1JTUVUeXBlKGRsLT5yZXNwb25zZU1JTUVU eXBlKCkpOwotCi0gICAgLy8gVGVsbCB0aGUgY2xpZW50IHdlJ3ZlIGNvbW1pdHRlZCB0aGlzIFVS TC4KLSAgICBBU1NFUlQobV9mcmFtZS52aWV3KCkpOworICAgIGlmIChkb2N1bWVudExvYWRlcikK KyAgICAgICAgZG9jdW1lbnRMb2FkZXItPndyaXRlcigpLnNldE1JTUVUeXBlKGRvY3VtZW50TG9h ZGVyLT5yZXNwb25zZU1JTUVUeXBlKCkpOwogCiAgICAgaWYgKG1fc3RhdGVNYWNoaW5lLmNyZWF0 aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKaW5kZXggNzZiMzg2NDJkYjJhNzMwMjFi NTJkMjBjOTdhOTI0NjdkYzI5YmNmMS4uMTYyN2UzNzQ1YjY5OTg0Y2IyMmQ3NWQyYjM2ODFhZjY1 YWM3Njg5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9s bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3Bw CkBAIC00MTQsOSArNDE0LDkgQEAgdm9pZCBGcmFtZUxvYWRlcjo6SGlzdG9yeUNvbnRyb2xsZXI6 OnVwZGF0ZUZvclJlZGlyZWN0V2l0aExvY2tlZEJhY2tGb3J3YXJkTGlzdCgKICAgICBMT0coSGlz dG9yeSwgIkhpc3RvcnlDb250cm9sbGVyICVwIHVwZGF0ZUZvclJlZGlyZWN0V2l0aExvY2tlZEJh Y2tGb3J3YXJkTGlzdDogVXBkYXRpbmcgSGlzdG9yeSBmb3IgcmVkaXJlY3QgbG9hZCBpbiBmcmFt ZSAlcCAobWFpbiBmcmFtZSAlZCkgJXMiLCB0aGlzLCAmbV9mcmFtZSwgbV9mcmFtZS5pc01haW5G cmFtZSgpLCBtX2ZyYW1lLmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkgPyBtX2ZyYW1lLmxvYWRl cigpLmRvY3VtZW50TG9hZGVyKCktPnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkgOiAiIik7 CiAgICAgCiAgICAgYm9vbCB1c2VzRXBoZW1lcmFsU2Vzc2lvbiA9IG1fZnJhbWUucGFnZSgpID8g bV9mcmFtZS5wYWdlKCktPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCkgOiB0cnVlOwotICAgIGNvbnN0 IFVSTCYgaGlzdG9yeVVSTCA9IG1fZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+dXJs Rm9ySGlzdG9yeSgpOworICAgIGF1dG8gaGlzdG9yeVVSTCA9IG1fZnJhbWUubG9hZGVyKCkuZG9j dW1lbnRMb2FkZXIoKSA/IG1fZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+dXJsRm9y SGlzdG9yeSgpIDogVVJMIHsgfTsKIAotICAgIGlmIChtX2ZyYW1lLmxvYWRlcigpLmRvY3VtZW50 TG9hZGVyKCktPmlzQ2xpZW50UmVkaXJlY3QoKSkgeworICAgIGlmIChtX2ZyYW1lLmxvYWRlcigp LmRvY3VtZW50TG9hZGVyKCkgJiYgbV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLT5p c0NsaWVudFJlZGlyZWN0KCkpIHsKICAgICAgICAgaWYgKCFtX2N1cnJlbnRJdGVtICYmICFtX2Zy YW1lLnRyZWUoKS5wYXJlbnQoKSkgewogICAgICAgICAgICAgaWYgKCFoaXN0b3J5VVJMLmlzRW1w dHkoKSkgewogICAgICAgICAgICAgICAgIHVwZGF0ZUJhY2tGb3J3YXJkTGlzdENsaXBwZWRBdFRh cmdldCh0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDQ4ZWE0Njgy YzA5NDVhNDA5MDgxYWIwMTgxNDFlODY1M2VlZGJkYTcuLmU0NmRhMGUwYTU4MDc5MTBmNGU0ZDJm NmZjNGU5MzE4NTA1NjdhZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAt MTQ4Nyw4ICsxNDg3LDkgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRv Q29tbWl0dGVkRm9yTmV3UGFnZSgpCiAgICAgICAgIHNob3VsZEhpZGVTY3JvbGxiYXJzID0gdHJ1 ZTsKICNlbmRpZgogCi0gICAgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UgPSBtX2Zy YW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKTsK LSAgICBtX2ZyYW1lSGFzQ3VzdG9tQ29udGVudFByb3ZpZGVyID0gaXNNYWluRnJhbWUgJiYgd2Vi UGFnZS0+c2hvdWxkVXNlQ3VzdG9tQ29udGVudFByb3ZpZGVyRm9yUmVzcG9uc2UocmVzcG9uc2Up OworICAgIG1fZnJhbWVIYXNDdXN0b21Db250ZW50UHJvdmlkZXIgPSBpc01haW5GcmFtZQorICAg ICAgICAmJiBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKQor ICAgICAgICAmJiB3ZWJQYWdlLT5zaG91bGRVc2VDdXN0b21Db250ZW50UHJvdmlkZXJGb3JSZXNw b25zZShtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+cmVz cG9uc2UoKSk7CiAgICAgbV9mcmFtZUNhbWVGcm9tQmFja0ZvcndhcmRDYWNoZSA9IGZhbHNlOwog CiAgICAgU2Nyb2xsYmFyTW9kZSBkZWZhdWx0U2Nyb2xsYmFyTW9kZSA9IHNob3VsZEhpZGVTY3Jv bGxiYXJzID8gU2Nyb2xsYmFyQWx3YXlzT2ZmIDogU2Nyb2xsYmFyQXV0bzsK