186057 2018-05-29 11:08:24 -0700 Add a consistency check between URL and CFURL 2018-05-30 14:23:04 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson commit-queue ggaren realdawei webkit-bug-importer oldest_to_newest 1428130 0 youennf 2018-05-29 11:08:24 -0700 Tightening URL and CFURL relationship is a healthy measure 1428148 1 341500 youennf 2018-05-29 11:40:35 -0700 Created attachment 341500 Patch 1428238 2 341524 youennf 2018-05-29 15:16:19 -0700 Created attachment 341524 Patch 1428266 3 341524 commit-queue 2018-05-29 16:18:25 -0700 Comment on attachment 341524 Patch Rejecting attachment 341524 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 341524, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Tools/ChangeLog contains OOPS!. Full output: http://webkit-queues.webkit.org/results/7852191 1428282 4 341537 youennf 2018-05-29 16:49:53 -0700 Created attachment 341537 Patch 1428296 5 341537 commit-queue 2018-05-29 17:18:46 -0700 Comment on attachment 341537 Patch Clearing flags on attachment: 341537 Committed r232281: <https://trac.webkit.org/changeset/232281> 1428297 6 commit-queue 2018-05-29 17:18:47 -0700 All reviewed patches have been landed. Closing bug. 1428299 7 webkit-bug-importer 2018-05-29 17:22:52 -0700 <rdar://problem/40635192> 1428492 8 realdawei 2018-05-30 10:41:27 -0700 This patch may have caused some API test failures: https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20WK2%20%28Tests%29/builds/4781/steps/run-api-tests/logs/stdio 1428595 9 youennf 2018-05-30 14:23:04 -0700 (In reply to David Fenton from comment #8) > This patch may have caused some API test failures: > > https://build.webkit.org/builders/ > Apple%20High%20Sierra%20Release%20WK2%20%28Tests%29/builds/4781/steps/run- > api-tests/logs/stdio Fixing them in https://bugs.webkit.org/show_bug.cgi?id=186108 341500 2018-05-29 11:40:35 -0700 2018-05-29 12:45:02 -0700 Patch bug-186057-20180529114035.patch text/plain 11555 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmMwZWE3NGVjYjdkYzg5 YzIxYTNjMzIwYjUxMTUwNGMxZTJmNDNkZi4uMTc4MWI5MmJhZDcwNzhjMTVkYWEzZGE3M2FjYmQ0 NTA2MTdkYWM5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE4LTA1LTI3ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBjb25zaXN0ZW5j eSBjaGVjayBiZXR3ZWVuIFVSTCBhbmQgQ0ZVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjA1NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDAy NTg0NTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCisKKyAgICAgICAgVGVz dDogaHR0cC93cHQvZmV0Y2gvcmVxdWVzdC11cmwuaHRtbAorCisgICAgICAgIEl0IGlzIGltcG9y dGFudCB0aGF0IFdlYkNvcmU6OlVSTCB1c2VkIGluIFdlYkNvcmUgYW5kIENGVVJMIHRoYXQgZ2V0 cyBzZXJpYWxpemVkIGluIHRoZSBuZXR3b3JrIHBpcGUgcmVtYWluIGNvbnNpc3RlbnQuCisgICAg ICAgIE90aGVyd2lzZSwgd2Ugd2lsbCBlbmQtdXAgd2l0aCBvZGQgYnVncy4KKworICAgICAgICBX ZSBhZGQgc3VjaCBhIGNoZWNrIHdoZW4gY3JlYXRpbmcgYSBDRlVSTCBmcm9tIGFuIFVSTC4KKyAg ICAgICAgVG8gbWFrZSB0aGluZ3MgbW9yZSBjb25zaXN0ZW50LCB3ZSBhbHNvIHJlbHkgbm93IG1v cmUgb24gV2ViQ29yZTo6VVJMIGluc3RlYWQgb2YgZGlyZWN0bHkgY3JlYXRpbmcgYSBDRlVSTC4K KworICAgICAgICAqIHBsYXRmb3JtL1VSTC5oOgorICAgICAgICAqIHBsYXRmb3JtL2NmL0NGVVJM RXh0cmFzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzQ0ZVUkxTYW1lT3JpZ2luKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9jZi9DRlVSTEV4dHJhcy5oOgorICAgICAgICAqIHBsYXRmb3JtL2NmL1VS TENGLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVSTDo6Y3JlYXRlQ0ZVUkwgY29uc3QpOgorICAg ICAgICAqIHBsYXRmb3JtL21hYy9VUkxNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpVUkw6OmNy ZWF0ZUNGVVJMIGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViQ29yZU5TVVJMRXh0 cmFzLm1tOgorICAgICAgICAoV2ViQ29yZTo6VVJMV2l0aFVzZXJUeXBlZFN0cmluZyk6CisKIDIw MTgtMDUtMjkgIE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogc2V0 VmFsdWUgb24gY29udGVudGVkaXRhYmxlIHNob3VsZCBwcmVzZXJ2ZSB3aGl0ZXNwYWNlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CmluZGV4IDIzZmZhYzdmNzk0YzU3MDcwNjhlMGUzZGUwMTllYmViNDZhMmYwNTIuLjUzNjVkYzQ4 ZmUwM2Y4MDMwMDFiMmMxNWYzMDIxOTBmNWY4ZDI4MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTgtMDUtMjcgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAg ICAgIEFkZCBhIGNvbnNpc3RlbmN5IGNoZWNrIGJldHdlZW4gVVJMIGFuZCBDRlVSTAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2MDU3CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80MDI1ODQ1Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBH YXJlbi4KKworICAgICAgICAqIFNoYXJlZC9Db2NvYS9XS05TVVJMRXh0cmFzLm1tOgorICAgICAg ICAoK1tOU1VSTCBfd2ViX1VSTFdpdGhXVEZTdHJpbmc6cmVsYXRpdmVUb1VSTDpdKToKKyAgICAg ICAgKHVybFdpdGhXVEZTdHJpbmcpOiBEZWxldGVkLgorICAgICAgICAoK1tOU1VSTCBfd2ViX1VS TFdpdGhXVEZTdHJpbmc6XSk6IERlbGV0ZWQuCisKIDIwMTgtMDUtMjkgIEdlb2ZmcmV5IEdhcmVu ICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmVkIHNvbWUgdW51c2VkIFdlYlNR TCB0cmFja2VycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkwuaAppbmRleCBkOWEwMmE2NjkyMzZmNzZjMjY3YzBj NTJhNjBmMmQ2ZWYzYWEyYzk1Li5kMWU2MDlhN2M2N2JiNzdlODk2MzZkOWIyN2E1N2JlOWQwYTdm ZjUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkwuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkwuaApAQCAtMTIwLDYgKzEyMCw3IEBAIHB1YmxpYzoKICAg ICBib29sIGhhc1Bhc3N3b3JkKCkgY29uc3Q7CiAgICAgYm9vbCBoYXNRdWVyeSgpIGNvbnN0Owog ICAgIGJvb2wgaGFzRnJhZ21lbnQoKSBjb25zdDsKKyAgICBib29sIGhhc1BhdGgoKSBjb25zdDsK IAogICAgIC8vIFVubGlrZSB1c2VyKCkgYW5kIHBhc3MoKSwgdGhlc2UgZnVuY3Rpb25zIGRvbid0 IGRlY29kZSBlc2NhcGUgc2VxdWVuY2VzLgogICAgIC8vIFRoaXMgaXMgbmVjZXNzYXJ5IGZvciBh Y2N1cmF0ZSByb3VuZC10cmlwcGluZywgYmVjYXVzZSBlbmNvZGluZyBkb2Vzbid0IGVuY29kZSAn JScgY2hhcmFjdGVycy4KQEAgLTIxNyw4ICsyMTgsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgaW5p dChjb25zdCBVUkwmLCBjb25zdCBTdHJpbmcmLCBjb25zdCBUZXh0RW5jb2RpbmcmKTsKICAgICB2 b2lkIGNvcHlUb0J1ZmZlcihWZWN0b3I8Y2hhciwgNTEyPiYgYnVmZmVyKSBjb25zdDsKIAotICAg IGJvb2wgaGFzUGF0aCgpIGNvbnN0OwotCiAgICAgU3RyaW5nIG1fc3RyaW5nOwogICAgIGJvb2wg bV9pc1ZhbGlkIDogMTsKICAgICBib29sIG1fcHJvdG9jb2xJc0luSFRUUEZhbWlseSA6IDE7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9DRlVSTEV4dHJhcy5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9DRlVSTEV4dHJhcy5jcHAKaW5kZXggOTE3OGNiMTky ZjA1M2UwNjNhODZhZmVlMzhhNzYwZjcyODliNTRlZS4uNzNiNDNiYzdhMDdiODBhZTRiYWEzNWZk YjczMzVhYzNiYTc2NDQxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2Yv Q0ZVUkxFeHRyYXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NGVVJMRXh0 cmFzLmNwcApAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUg IkNGVVJMRXh0cmFzLmgiCiAKKyNpbmNsdWRlICJVUkwuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9D U3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTU5LDQgKzYwLDIyIEBAIHZvaWQg Z2V0VVJMQnl0ZXMoQ0ZVUkxSZWYgdXJsLCBDU3RyaW5nJiByZXN1bHQpCiAgICAgQVNTRVJUX1VO VVNFRChmaW5hbExlbmd0aCwgZmluYWxMZW5ndGggPT0gYnl0ZXNMZW5ndGgpOwogfQogCitib29s IGlzQ0ZVUkxTYW1lT3JpZ2luKENGVVJMUmVmIGNmVVJMLCBjb25zdCBVUkwmIHVybCkKK3sKKyAg ICBBU1NFUlQodXJsLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSk7CisKKyAgICBpZiAodXJsLmhh c1VzZXJuYW1lKCkgfHwgdXJsLmhhc1Bhc3N3b3JkKCkpCisgICAgICAgIHJldHVybiBwcm90b2Nv bEhvc3RBbmRQb3J0QXJlRXF1YWwodXJsLCBVUkwgeyBjZlVSTCB9KTsKKworICAgIFVSTENoYXJC dWZmZXIgYnl0ZXM7CisgICAgZ2V0VVJMQnl0ZXMoY2ZVUkwsIGJ5dGVzKTsKKyAgICBTdHJpbmdW aWV3IGNmVVJMU3RyaW5nIHsgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBMQ2hhcio+KGJ5dGVzLmRh dGEoKSksIHN0YXRpY19jYXN0PHVuc2lnbmVkPihieXRlcy5zaXplKCkpIH07CisKKyAgICBpZiAo IXVybC5oYXNQYXRoKCkpCisgICAgICAgIHJldHVybiBTdHJpbmdWaWV3IHsgdXJsLnN0cmluZygp IH0gPT0gY2ZVUkxTdHJpbmc7CisKKyAgICBhdXRvIHVybFdpdGhvdXRQYXRoID0gU3RyaW5nVmll dyB7IHVybC5zdHJpbmcoKSB9LnN1YnN0cmluZygwLCB1cmwucGF0aFN0YXJ0KCkgKyAxKTsKKyAg ICByZXR1cm4gY2ZVUkxTdHJpbmcuc3RhcnRzV2l0aCh1cmxXaXRob3V0UGF0aCk7Cit9CisKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NGVVJMRXh0cmFzLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9DRlVSTEV4dHJhcy5oCmluZGV4IGQ1ZTcyYmY1MGQz OTY5YzQwMGUxZjVmNmNjMjY5MjdhOTlmOGUwNTEuLmZmZDU3MDY2MGRhNmFhOThkMTIyODY0MDc4 ZmVkN2RkNmU3NzllZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NG VVJMRXh0cmFzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvQ0ZVUkxFeHRyYXMu aApAQCAtMzIsMTIgKzMyLDE1IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgVVJM OwogdHlwZWRlZiBWZWN0b3I8Y2hhciwgNTEyPiBVUkxDaGFyQnVmZmVyOwogCiBXRUJDT1JFX0VY UE9SVCBSZXRhaW5QdHI8Q0ZVUkxSZWY+IGNyZWF0ZUNGVVJMRnJvbUJ1ZmZlcihjb25zdCBjaGFy Kiwgc2l6ZV90LCBDRlVSTFJlZiBiYXNlVVJMID0gMCk7CiBXRUJDT1JFX0VYUE9SVCB2b2lkIGdl dFVSTEJ5dGVzKENGVVJMUmVmLCBVUkxDaGFyQnVmZmVyJik7CiBXRUJDT1JFX0VYUE9SVCB2b2lk IGdldFVSTEJ5dGVzKENGVVJMUmVmLCBDU3RyaW5nJik7CiAKK2Jvb2wgaXNDRlVSTFNhbWVPcmln aW4oQ0ZVUkxSZWYsIGNvbnN0IFVSTCYpOworCiB9CiAKICNlbmRpZiAvLyBDRlVSTEV4dHJhc19o CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9VUkxDRi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9VUkxDRi5jcHAKaW5kZXggOGZlZGVmMjI2ZjFiOTRkMWRm ZmNkZWUxYmU0ZDg4NWJkNzEzZjc3Yy4uYWI2NDFlZDJkOWJlYzEzZDZhMTc3OGY2MzY2MmY5YjY2 N2E5NzFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvVVJMQ0YuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL1VSTENGLmNwcApAQCAtNTksNyArNTks MTIgQEAgUmV0YWluUHRyPENGVVJMUmVmPiBVUkw6OmNyZWF0ZUNGVVJMKCkgY29uc3QKICAgICAv LyB3aGljaCBpcyBjbGVhcmx5IHdyb25nLgogICAgIFVSTENoYXJCdWZmZXIgYnVmZmVyOwogICAg IGNvcHlUb0J1ZmZlcihidWZmZXIpOwotICAgIHJldHVybiBjcmVhdGVDRlVSTEZyb21CdWZmZXIo YnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSk7CisgICAgYXV0byBjZlVSTCA9IGNyZWF0ZUNG VVJMRnJvbUJ1ZmZlcihidWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpKTsKKworICAgIGlmIChw cm90b2NvbElzSW5IVFRQRmFtaWx5KCkgJiYgIWlzQ0ZVUkxTYW1lT3JpZ2luKGNmVVJMLmdldCgp LCAqdGhpcykpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgcmV0dXJuIGNmVVJMOwog fQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9VUkxN YWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvVVJMTWFjLm1tCmluZGV4IGZjNWM0 NmQ2MzI3MzA0YTcyZGJlNDE4NTJhMGJlYjdiZDdhM2JhOTcuLjIxNjQxMTZiZTAzMThhYjk3Yzdk YWEyODhiODkwZWZlZWZmMmE0N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9VUkxNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1VSTE1hYy5t bQpAQCAtNjksMTQgKzY5LDIyIEBAIFJldGFpblB0cjxDRlVSTFJlZj4gVVJMOjpjcmVhdGVDRlVS TCgpIGNvbnN0CiAgICAgICAgIHJldHVybiByZWludGVycHJldF9jYXN0PENGVVJMUmVmPihhZG9w dE5TKFtbTlNVUkwgYWxsb2NdIGluaXRXaXRoU3RyaW5nOkAiIl0pLmdldCgpKTsKICAgICB9CiAK KyAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IGNmVVJMOworCiAgICAgLy8gRmFzdCBwYXRoIGlmIHRo ZSBpbnB1dCBkYXRhIGlzIDgtYml0IHRvIGF2b2lkIGNvcHlpbmcgaW50byBhIHRlbXBvcmFyeSBi dWZmZXIuCiAgICAgaWYgKExJS0VMWShtX3N0cmluZy5pczhCaXQoKSkpCi0gICAgICAgIHJldHVy biBjcmVhdGVDRlVSTEZyb21CdWZmZXIocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4obV9z dHJpbmcuY2hhcmFjdGVyczgoKSksIG1fc3RyaW5nLmxlbmd0aCgpKTsKKyAgICAgICAgY2ZVUkwg PSBjcmVhdGVDRlVSTEZyb21CdWZmZXIocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4obV9z dHJpbmcuY2hhcmFjdGVyczgoKSksIG1fc3RyaW5nLmxlbmd0aCgpKTsKKyAgICBlbHNlIHsKKyAg ICAgICAgLy8gU2xvd2VyIHBhdGguCisgICAgICAgIFVSTENoYXJCdWZmZXIgYnVmZmVyOworICAg ICAgICBjb3B5VG9CdWZmZXIoYnVmZmVyKTsKKyAgICAgICAgY2ZVUkwgPSBjcmVhdGVDRlVSTEZy b21CdWZmZXIoYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSk7CisgICAgfQorCisgICAgaWYg KHByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSAmJiAhaXNDRlVSTFNhbWVPcmlnaW4oY2ZVUkwuZ2V0 KCksICp0aGlzKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICAvLyBTbG93ZXIgcGF0 aC4KLSAgICBVUkxDaGFyQnVmZmVyIGJ1ZmZlcjsKLSAgICBjb3B5VG9CdWZmZXIoYnVmZmVyKTsK LSAgICByZXR1cm4gY3JlYXRlQ0ZVUkxGcm9tQnVmZmVyKGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5z aXplKCkpOworICAgIHJldHVybiBjZlVSTDsKIH0KIAogYm9vbCBVUkw6Omhvc3RJc0lQQWRkcmVz cyhjb25zdCBTdHJpbmcmIGhvc3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvV2ViQ29yZU5TVVJMRXh0cmFzLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1dlYkNvcmVOU1VSTEV4dHJhcy5tbQppbmRleCBlNGZlMzNhNWQ0NTgwZDU5ZjRiZWU1M2UxOWM3 M2IyZTBjMjhlYzZmLi44OGQ5YzBiYWY0NDVjOTdjMDQwZjViOGU2MzZjZWRjOGQ0YTZiY2QxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZU5TVVJMRXh0cmFz Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlTlNVUkxFeHRyYXMu bW0KQEAgLTg4Niw3ICs4ODYsNyBAQCBzdGF0aWMgTlNEYXRhICpkYXRhV2l0aFVzZXJUeXBlZFN0 cmluZyhOU1N0cmluZyAqc3RyaW5nKQogICAgIHJldHVybiBbTlNEYXRhIGRhdGFXaXRoQnl0ZXNO b0NvcHk6b3V0Qnl0ZXMgbGVuZ3RoOm91dExlbmd0aF07IC8vIGFkb3B0cyBvdXRCeXRlcwogfQog Ci1OU1VSTCAqVVJMV2l0aFVzZXJUeXBlZFN0cmluZyhOU1N0cmluZyAqc3RyaW5nLCBOU1VSTCAq VVJMKQorTlNVUkwgKlVSTFdpdGhVc2VyVHlwZWRTdHJpbmcoTlNTdHJpbmcgKnN0cmluZywgTlNV UkwgKm5zVVJMKQogewogICAgIGlmICghc3RyaW5nKQogICAgICAgICByZXR1cm4gbmlsOwpAQCAt ODk1LDExICs4OTUsOCBAQCBOU1VSTCAqVVJMV2l0aFVzZXJUeXBlZFN0cmluZyhOU1N0cmluZyAq c3RyaW5nLCBOU1VSTCAqVVJMKQogICAgIGlmICghc3RyaW5nKQogICAgICAgICByZXR1cm4gbmls OwogCi0gICAgTlNEYXRhICpkYXRhID0gZGF0YVdpdGhVc2VyVHlwZWRTdHJpbmcoc3RyaW5nKTsK LSAgICBpZiAoIWRhdGEpCi0gICAgICAgIHJldHVybiBbTlNVUkwgVVJMV2l0aFN0cmluZzpAIiJd OwotCi0gICAgcmV0dXJuIFVSTFdpdGhEYXRhKGRhdGEsIFVSTCk7CisgICAgVVJMIHVybCB7IFVS TCB7IG5zVVJMIH0sIHN0cmluZyB9OworICAgIHJldHVybiAoX19icmlkZ2UgTlNVUkwqKSB1cmwu Y3JlYXRlQ0ZVUkwoKS5hdXRvcmVsZWFzZSgpOwogfQogCiBOU1VSTCAqVVJMV2l0aFVzZXJUeXBl ZFN0cmluZ0RlcHJlY2F0ZWQoTlNTdHJpbmcgKnN0cmluZywgTlNVUkwgKlVSTCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dLTlNVUkxFeHRyYXMubW0gYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9Db2NvYS9XS05TVVJMRXh0cmFzLm1tCmluZGV4IDU2ZDQ5MTBkY2UxNmEz Mzg1YjRmODE3ZTA2MDQ4MTJjNjY0MzAzODMuLjg5NWFmZTk5MjYzNjgzYTVkMzJlN2YwMmI0OTUz NmQzYjZhNWEzNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dLTlNV UkxFeHRyYXMubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV0tOU1VSTEV4dHJh cy5tbQpAQCAtMjcsNiArMjcsNyBAQAogI2ltcG9ydCAiV0tOU1VSTEV4dHJhcy5oIgogCiAjaW1w b3J0IDxXZWJDb3JlL0NGVVJMRXh0cmFzLmg+CisjaW1wb3J0IDxXZWJDb3JlL1VSTC5oPgogI2lt cG9ydCA8d3RmL3RleHQvQ1N0cmluZy5oPgogI2ltcG9ydCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+ CiAKQEAgLTM0LDIzICszNSwxNiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogQGltcGxl bWVudGF0aW9uIE5TVVJMIChXS0V4dHJhcykKIAotc3RhdGljIGlubGluZSBOU1VSTCAqdXJsV2l0 aFdURlN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZywgTlNVUkwgKmJhc2VVUkwgPSBuaWwpCi17 Ci0gICAgaWYgKCFzdHJpbmcpCi0gICAgICAgIHJldHVybiBuaWw7Ci0KLSAgICBDU3RyaW5nIGJ1 ZmZlciA9IHN0cmluZy51dGY4KCk7Ci0gICAgcmV0dXJuIChOU1VSTCAqKWNyZWF0ZUNGVVJMRnJv bUJ1ZmZlcihidWZmZXIuZGF0YSgpLCBidWZmZXIubGVuZ3RoKCksIChDRlVSTFJlZiliYXNlVVJM KS5hdXRvcmVsZWFzZSgpOwotfQotCiArIChpbnN0YW5jZXR5cGUpX3dlYl9VUkxXaXRoV1RGU3Ry aW5nOihjb25zdCBTdHJpbmcmKXN0cmluZwogewotICAgIHJldHVybiB1cmxXaXRoV1RGU3RyaW5n KHN0cmluZyk7CisgICAgVVJMIHVybCB7IFVSTCB7IH0sIHN0cmluZyB9OworICAgIHJldHVybiAo X19icmlkZ2UgTlNVUkwqKSB1cmwuY3JlYXRlQ0ZVUkwoKS5hdXRvcmVsZWFzZSgpOwogfQogCiAr IChpbnN0YW5jZXR5cGUpX3dlYl9VUkxXaXRoV1RGU3RyaW5nOihjb25zdCBTdHJpbmcmKXN0cmlu ZyByZWxhdGl2ZVRvVVJMOihOU1VSTCAqKWJhc2VVUkwKIHsKLSAgICByZXR1cm4gdXJsV2l0aFdU RlN0cmluZyhzdHJpbmcsIGJhc2VVUkwpOworICAgIFVSTCB1cmwgeyBVUkwgeyBiYXNlVVJMIH0s IHN0cmluZyB9OworICAgIHJldHVybiAoX19icmlkZ2UgTlNVUkwqKSB1cmwuY3JlYXRlQ0ZVUkwo KS5hdXRvcmVsZWFzZSgpOwogfQogCiAtIChTdHJpbmcpX3dlYl9vcmlnaW5hbERhdGFBc1dURlN0 cmluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDJkNGVjYmUzMWNkNDBkYTE3MGFhMTMyZjhhZDY5Y2NlZjYwNzA2MzQuLmZi NDAyNDk3N2I5MmE5NTQ5NjRjYWRkNmNmYmRhNGNiNWQ1ZGFjZDcgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxOC0wNS0yNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAg ICAgICAgQWRkIGEgY29uc2lzdGVuY3kgY2hlY2sgYmV0d2VlbiBVUkwgYW5kIENGVVJMCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYwNTcKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzQwMjU4NDU3PgorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2Zm IEdhcmVuLgorCisgICAgICAgICogaHR0cC93cHQvZmV0Y2gvcmVxdWVzdC11cmwtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3dwdC9mZXRjaC9yZXF1ZXN0LXVybC5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvaHR0cC93cHQvZmV0Y2gvcmVxdWVzdC11cmwt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAxOC0wNS0yOSAgTmFuIFdhbmcgIDxuX3dhbmdAYXBw bGUuY29tPgogCiAgICAgICAgIEFYOiBzZXRWYWx1ZSBvbiBjb250ZW50ZWRpdGFibGUgc2hvdWxk IHByZXNlcnZlIHdoaXRlc3BhY2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L2Zl dGNoL3JlcXVlc3QtdXJsLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L2ZldGNo L3JlcXVlc3QtdXJsLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42ZDdmMGNmOTNkNTc1NTNmOGYy MmNhZmRmMzY4YjE2NTcxOWJkZTAyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0 cC93cHQvZmV0Y2gvcmVxdWVzdC11cmwtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorCitQ QVNTIEZldGNoIFVSTCB3aXRoICc7JyAKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93 cHQvZmV0Y2gvcmVxdWVzdC11cmwuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L2ZldGNoL3Jl cXVlc3QtdXJsLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOThhOTVhZTg5YzRkZTBmNGEyNjIxZWEzZTg0ODRk ZGI4OTQwNTBlNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L2ZldGNo L3JlcXVlc3QtdXJsLmh0bWwKQEAgLTAsMCArMSwxNCBAQAorPCFkb2N0eXBlIGh0bWw+Cis8aHRt bD4KKyAgPGhlYWQ+CisgICAgPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMi Pjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0 LmpzIj48L3NjcmlwdD4KKyAgPC9oZWFkPgorICA8Ym9keT4KKyAgICA8c2NyaXB0PgorcHJvbWlz ZV90ZXN0KCgpID0+IHsKKyAgICByZXR1cm4gZmV0Y2goImh0dHA6Ly9sb2NhbGhvc3Q6ODgwMC8u LjsuLjtAbG9jYWxob3N0Ojg4ODgvIik7Cit9LCAiRmV0Y2ggVVJMIHdpdGggJzsnIik7CisgICAg PC9zY3JpcHQ+CisgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9odHRwL3dwdC9mZXRjaC9yZXF1ZXN0LXVybC1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvaHR0cC93cHQvZmV0Y2gvcmVxdWVzdC11cmwtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLmZjMmQxOTUxNWIxNmU3MzM5YTczZGMyMzNkZDhmYmFiNThhOGRlYjIK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvaHR0cC93cHQvZmV0 Y2gvcmVxdWVzdC11cmwtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorCitGQUlMIEZldGNo IFVSTCB3aXRoICc7JyBwcm9taXNlX3Rlc3Q6IFVuaGFuZGxlZCByZWplY3Rpb24gd2l0aCB2YWx1 ZTogb2JqZWN0ICJUeXBlRXJyb3I6IHVuc3VwcG9ydGVkIFVSTCIKKwo= 341524 2018-05-29 15:16:19 -0700 2018-05-29 16:49:52 -0700 Patch bug-186057-20180529151618.patch text/plain 12994 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmMwZWE3NGVjYjdkYzg5 YzIxYTNjMzIwYjUxMTUwNGMxZTJmNDNkZi4uZmE1NjgzZDgxZDE0YzFkMDNkOTg4NzY3NDkwNmYz MDkwYjk2OGMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTA1LTI3ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBjb25zaXN0ZW5j eSBjaGVjayBiZXR3ZWVuIFVSTCBhbmQgQ0ZVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjA1NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDAy NTg0NTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCisKKyAgICAgICAgSXQg aXMgaW1wb3J0YW50IHRoYXQgV2ViQ29yZTo6VVJMIHVzZWQgaW4gV2ViQ29yZSBhbmQgQ0ZVUkwg dGhhdCBnZXRzIHNlcmlhbGl6ZWQgaW4gdGhlIG5ldHdvcmsgcGlwZSByZW1haW4gY29uc2lzdGVu dC4KKyAgICAgICAgT3RoZXJ3aXNlLCB3ZSB3aWxsIGVuZC11cCB3aXRoIG9kZCBidWdzLgorCisg ICAgICAgIFdlIGFkZCBzdWNoIGEgY2hlY2sgd2hlbiBjcmVhdGluZyBhIENGVVJMIGZyb20gYW4g VVJMLgorICAgICAgICBUbyBtYWtlIHRoaW5ncyBtb3JlIGNvbnNpc3RlbnQsIHdlIGFsc28gcmVs eSBub3cgbW9yZSBvbiBXZWJDb3JlOjpVUkwgaW5zdGVhZCBvZiBkaXJlY3RseSBjcmVhdGluZyBh IENGVVJMLgorCisgICAgICAgICogcGxhdGZvcm0vVVJMLmg6CisgICAgICAgICogcGxhdGZvcm0v Y2YvQ0ZVUkxFeHRyYXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNDRlVSTFNhbWVPcmlnaW4p OgorICAgICAgICAqIHBsYXRmb3JtL2NmL0NGVVJMRXh0cmFzLmg6CisgICAgICAgICogcGxhdGZv cm0vY2YvVVJMQ0YuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VVJMOjpjcmVhdGVDRlVSTCBjb25z dCk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1VSTE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6 OlVSTDo6Y3JlYXRlQ0ZVUkwgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJDb3Jl TlNVUkxFeHRyYXMubW06CisgICAgICAgIChXZWJDb3JlOjpVUkxXaXRoVXNlclR5cGVkU3RyaW5n KToKKwogMjAxOC0wNS0yOSAgTmFuIFdhbmcgIDxuX3dhbmdAYXBwbGUuY29tPgogCiAgICAgICAg IEFYOiBzZXRWYWx1ZSBvbiBjb250ZW50ZWRpdGFibGUgc2hvdWxkIHByZXNlcnZlIHdoaXRlc3Bh Y2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKaW5kZXggMjNmZmFjN2Y3OTRjNTcwNzA2OGUwZTNkZTAxOWViZWI0NmEyZjA1Mi4u NTM2NWRjNDhmZTAzZjgwMzAwMWIyYzE1ZjMwMjE5MGY1ZjhkMjgwMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOC0wNS0yNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+ CisKKyAgICAgICAgQWRkIGEgY29uc2lzdGVuY3kgY2hlY2sgYmV0d2VlbiBVUkwgYW5kIENGVVJM CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYwNTcK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQwMjU4NDU3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IEdlb2ZmIEdhcmVuLgorCisgICAgICAgICogU2hhcmVkL0NvY29hL1dLTlNVUkxFeHRyYXMubW06 CisgICAgICAgICgrW05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpyZWxhdGl2ZVRvVVJMOl0p OgorICAgICAgICAodXJsV2l0aFdURlN0cmluZyk6IERlbGV0ZWQuCisgICAgICAgICgrW05TVVJM IF93ZWJfVVJMV2l0aFdURlN0cmluZzpdKTogRGVsZXRlZC4KKwogMjAxOC0wNS0yOSAgR2VvZmZy ZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZWQgc29tZSB1bnVz ZWQgV2ViU1FMIHRyYWNrZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9V UkwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5oCmluZGV4IGQ5YTAyYTY2OTIzNmY3 NmMyNjdjMGM1MmE2MGYyZDZlZjNhYTJjOTUuLmQxZTYwOWE3YzY3YmI3N2U4OTYzNmQ5YjI3YTU3 YmU5ZDBhN2ZmNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5oCkBAIC0xMjAsNiArMTIwLDcgQEAgcHVi bGljOgogICAgIGJvb2wgaGFzUGFzc3dvcmQoKSBjb25zdDsKICAgICBib29sIGhhc1F1ZXJ5KCkg Y29uc3Q7CiAgICAgYm9vbCBoYXNGcmFnbWVudCgpIGNvbnN0OworICAgIGJvb2wgaGFzUGF0aCgp IGNvbnN0OwogCiAgICAgLy8gVW5saWtlIHVzZXIoKSBhbmQgcGFzcygpLCB0aGVzZSBmdW5jdGlv bnMgZG9uJ3QgZGVjb2RlIGVzY2FwZSBzZXF1ZW5jZXMuCiAgICAgLy8gVGhpcyBpcyBuZWNlc3Nh cnkgZm9yIGFjY3VyYXRlIHJvdW5kLXRyaXBwaW5nLCBiZWNhdXNlIGVuY29kaW5nIGRvZXNuJ3Qg ZW5jb2RlICclJyBjaGFyYWN0ZXJzLgpAQCAtMjE3LDggKzIxOCw2IEBAIHByaXZhdGU6CiAgICAg dm9pZCBpbml0KGNvbnN0IFVSTCYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IFRleHRFbmNvZGluZyYp OwogICAgIHZvaWQgY29weVRvQnVmZmVyKFZlY3RvcjxjaGFyLCA1MTI+JiBidWZmZXIpIGNvbnN0 OwogCi0gICAgYm9vbCBoYXNQYXRoKCkgY29uc3Q7Ci0KICAgICBTdHJpbmcgbV9zdHJpbmc7CiAg ICAgYm9vbCBtX2lzVmFsaWQgOiAxOwogICAgIGJvb2wgbV9wcm90b2NvbElzSW5IVFRQRmFtaWx5 IDogMTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NGVVJMRXh0cmFz LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NGVVJMRXh0cmFzLmNwcAppbmRleCA5 MTc4Y2IxOTJmMDUzZTA2M2E4NmFmZWUzOGE3NjBmNzI4OWI1NGVlLi43M2I0M2JjN2EwN2I4MGFl NGJhYTM1ZmRiNzMzNWFjM2JhNzY0NDE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jZi9DRlVSTEV4dHJhcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2Yv Q0ZVUkxFeHRyYXMuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiQ0ZVUkxFeHRyYXMuaCIKIAorI2luY2x1ZGUgIlVSTC5oIgogI2luY2x1ZGUgPHd0 Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTksNCArNjAsMjIg QEAgdm9pZCBnZXRVUkxCeXRlcyhDRlVSTFJlZiB1cmwsIENTdHJpbmcmIHJlc3VsdCkKICAgICBB U1NFUlRfVU5VU0VEKGZpbmFsTGVuZ3RoLCBmaW5hbExlbmd0aCA9PSBieXRlc0xlbmd0aCk7CiB9 CiAKK2Jvb2wgaXNDRlVSTFNhbWVPcmlnaW4oQ0ZVUkxSZWYgY2ZVUkwsIGNvbnN0IFVSTCYgdXJs KQoreworICAgIEFTU0VSVCh1cmwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKTsKKworICAgIGlm ICh1cmwuaGFzVXNlcm5hbWUoKSB8fCB1cmwuaGFzUGFzc3dvcmQoKSkKKyAgICAgICAgcmV0dXJu IHByb3RvY29sSG9zdEFuZFBvcnRBcmVFcXVhbCh1cmwsIFVSTCB7IGNmVVJMIH0pOworCisgICAg VVJMQ2hhckJ1ZmZlciBieXRlczsKKyAgICBnZXRVUkxCeXRlcyhjZlVSTCwgYnl0ZXMpOworICAg IFN0cmluZ1ZpZXcgY2ZVUkxTdHJpbmcgeyByZWludGVycHJldF9jYXN0PGNvbnN0IExDaGFyKj4o Ynl0ZXMuZGF0YSgpKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGJ5dGVzLnNpemUoKSkgfTsKKwor ICAgIGlmICghdXJsLmhhc1BhdGgoKSkKKyAgICAgICAgcmV0dXJuIFN0cmluZ1ZpZXcgeyB1cmwu c3RyaW5nKCkgfSA9PSBjZlVSTFN0cmluZzsKKworICAgIGF1dG8gdXJsV2l0aG91dFBhdGggPSBT dHJpbmdWaWV3IHsgdXJsLnN0cmluZygpIH0uc3Vic3RyaW5nKDAsIHVybC5wYXRoU3RhcnQoKSAr IDEpOworICAgIHJldHVybiBjZlVSTFN0cmluZy5zdGFydHNXaXRoKHVybFdpdGhvdXRQYXRoKTsK K30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvQ0ZVUkxFeHRy YXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NGVVJMRXh0cmFzLmgKaW5kZXggZDVl NzJiZjUwZDM5NjljNDAwZTFmNWY2Y2MyNjkyN2E5OWY4ZTA1MS4uZmZkNTcwNjYwZGE2YWE5OGQx MjI4NjQwNzhmZWQ3ZGQ2ZTc3OWVmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2YvQ0ZVUkxFeHRyYXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9DRlVS TEV4dHJhcy5oCkBAIC0zMiwxMiArMzIsMTUgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitj bGFzcyBVUkw7CiB0eXBlZGVmIFZlY3RvcjxjaGFyLCA1MTI+IFVSTENoYXJCdWZmZXI7CiAKIFdF QkNPUkVfRVhQT1JUIFJldGFpblB0cjxDRlVSTFJlZj4gY3JlYXRlQ0ZVUkxGcm9tQnVmZmVyKGNv bnN0IGNoYXIqLCBzaXplX3QsIENGVVJMUmVmIGJhc2VVUkwgPSAwKTsKIFdFQkNPUkVfRVhQT1JU IHZvaWQgZ2V0VVJMQnl0ZXMoQ0ZVUkxSZWYsIFVSTENoYXJCdWZmZXImKTsKIFdFQkNPUkVfRVhQ T1JUIHZvaWQgZ2V0VVJMQnl0ZXMoQ0ZVUkxSZWYsIENTdHJpbmcmKTsKIAorYm9vbCBpc0NGVVJM U2FtZU9yaWdpbihDRlVSTFJlZiwgY29uc3QgVVJMJik7CisKIH0KIAogI2VuZGlmIC8vIENGVVJM RXh0cmFzX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL1VSTENGLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL1VSTENGLmNwcAppbmRleCA4ZmVkZWYyMjZm MWI5NGQxZGZmY2RlZTFiZTRkODg1YmQ3MTNmNzdjLi5hYjY0MWVkMmQ5YmVjMTNkNmExNzc4ZjYz NjYyZjliNjY3YTk3MWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9V UkxDRi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvVVJMQ0YuY3BwCkBAIC01 OSw3ICs1OSwxMiBAQCBSZXRhaW5QdHI8Q0ZVUkxSZWY+IFVSTDo6Y3JlYXRlQ0ZVUkwoKSBjb25z dAogICAgIC8vIHdoaWNoIGlzIGNsZWFybHkgd3JvbmcuCiAgICAgVVJMQ2hhckJ1ZmZlciBidWZm ZXI7CiAgICAgY29weVRvQnVmZmVyKGJ1ZmZlcik7Ci0gICAgcmV0dXJuIGNyZWF0ZUNGVVJMRnJv bUJ1ZmZlcihidWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpKTsKKyAgICBhdXRvIGNmVVJMID0g Y3JlYXRlQ0ZVUkxGcm9tQnVmZmVyKGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5zaXplKCkpOworCisg ICAgaWYgKHByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSAmJiAhaXNDRlVSTFNhbWVPcmlnaW4oY2ZV UkwuZ2V0KCksICp0aGlzKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICByZXR1cm4g Y2ZVUkw7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1VSTE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9VUkxNYWMubW0KaW5k ZXggZmM1YzQ2ZDYzMjczMDRhNzJkYmU0MTg1MmEwYmViN2JkN2EzYmE5Ny4uMjE2NDExNmJlMDMx OGFiOTdjN2RhYTI4OGI4OTBlZmVlZmYyYTQ3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1VSTE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv VVJMTWFjLm1tCkBAIC02OSwxNCArNjksMjIgQEAgUmV0YWluUHRyPENGVVJMUmVmPiBVUkw6OmNy ZWF0ZUNGVVJMKCkgY29uc3QKICAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Q0ZVUkxS ZWY+KGFkb3B0TlMoW1tOU1VSTCBhbGxvY10gaW5pdFdpdGhTdHJpbmc6QCIiXSkuZ2V0KCkpOwog ICAgIH0KIAorICAgIFJldGFpblB0cjxDRlVSTFJlZj4gY2ZVUkw7CisKICAgICAvLyBGYXN0IHBh dGggaWYgdGhlIGlucHV0IGRhdGEgaXMgOC1iaXQgdG8gYXZvaWQgY29weWluZyBpbnRvIGEgdGVt cG9yYXJ5IGJ1ZmZlci4KICAgICBpZiAoTElLRUxZKG1fc3RyaW5nLmlzOEJpdCgpKSkKLSAgICAg ICAgcmV0dXJuIGNyZWF0ZUNGVVJMRnJvbUJ1ZmZlcihyZWludGVycHJldF9jYXN0PGNvbnN0IGNo YXIqPihtX3N0cmluZy5jaGFyYWN0ZXJzOCgpKSwgbV9zdHJpbmcubGVuZ3RoKCkpOworICAgICAg ICBjZlVSTCA9IGNyZWF0ZUNGVVJMRnJvbUJ1ZmZlcihyZWludGVycHJldF9jYXN0PGNvbnN0IGNo YXIqPihtX3N0cmluZy5jaGFyYWN0ZXJzOCgpKSwgbV9zdHJpbmcubGVuZ3RoKCkpOworICAgIGVs c2UgeworICAgICAgICAvLyBTbG93ZXIgcGF0aC4KKyAgICAgICAgVVJMQ2hhckJ1ZmZlciBidWZm ZXI7CisgICAgICAgIGNvcHlUb0J1ZmZlcihidWZmZXIpOworICAgICAgICBjZlVSTCA9IGNyZWF0 ZUNGVVJMRnJvbUJ1ZmZlcihidWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpKTsKKyAgICB9CisK KyAgICBpZiAocHJvdG9jb2xJc0luSFRUUEZhbWlseSgpICYmICFpc0NGVVJMU2FtZU9yaWdpbihj ZlVSTC5nZXQoKSwgKnRoaXMpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIC8vIFNs b3dlciBwYXRoLgotICAgIFVSTENoYXJCdWZmZXIgYnVmZmVyOwotICAgIGNvcHlUb0J1ZmZlcihi dWZmZXIpOwotICAgIHJldHVybiBjcmVhdGVDRlVSTEZyb21CdWZmZXIoYnVmZmVyLmRhdGEoKSwg YnVmZmVyLnNpemUoKSk7CisgICAgcmV0dXJuIGNmVVJMOwogfQogCiBib29sIFVSTDo6aG9zdElz SVBBZGRyZXNzKGNvbnN0IFN0cmluZyYgaG9zdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9XZWJDb3JlTlNVUkxFeHRyYXMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvV2ViQ29yZU5TVVJMRXh0cmFzLm1tCmluZGV4IGU0ZmUzM2E1ZDQ1ODBkNTlmNGJl ZTUzZTE5YzczYjJlMGMyOGVjNmYuLjg4ZDljMGJhZjQ0NWM5N2MwNDBmNWI4ZTYzNmNlZGM4ZDRh NmJjZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlTlNV UkxFeHRyYXMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVOU1VS TEV4dHJhcy5tbQpAQCAtODg2LDcgKzg4Niw3IEBAIHN0YXRpYyBOU0RhdGEgKmRhdGFXaXRoVXNl clR5cGVkU3RyaW5nKE5TU3RyaW5nICpzdHJpbmcpCiAgICAgcmV0dXJuIFtOU0RhdGEgZGF0YVdp dGhCeXRlc05vQ29weTpvdXRCeXRlcyBsZW5ndGg6b3V0TGVuZ3RoXTsgLy8gYWRvcHRzIG91dEJ5 dGVzCiB9CiAKLU5TVVJMICpVUkxXaXRoVXNlclR5cGVkU3RyaW5nKE5TU3RyaW5nICpzdHJpbmcs IE5TVVJMICpVUkwpCitOU1VSTCAqVVJMV2l0aFVzZXJUeXBlZFN0cmluZyhOU1N0cmluZyAqc3Ry aW5nLCBOU1VSTCAqbnNVUkwpCiB7CiAgICAgaWYgKCFzdHJpbmcpCiAgICAgICAgIHJldHVybiBu aWw7CkBAIC04OTUsMTEgKzg5NSw4IEBAIE5TVVJMICpVUkxXaXRoVXNlclR5cGVkU3RyaW5nKE5T U3RyaW5nICpzdHJpbmcsIE5TVVJMICpVUkwpCiAgICAgaWYgKCFzdHJpbmcpCiAgICAgICAgIHJl dHVybiBuaWw7CiAKLSAgICBOU0RhdGEgKmRhdGEgPSBkYXRhV2l0aFVzZXJUeXBlZFN0cmluZyhz dHJpbmcpOwotICAgIGlmICghZGF0YSkKLSAgICAgICAgcmV0dXJuIFtOU1VSTCBVUkxXaXRoU3Ry aW5nOkAiIl07Ci0KLSAgICByZXR1cm4gVVJMV2l0aERhdGEoZGF0YSwgVVJMKTsKKyAgICBVUkwg dXJsIHsgVVJMIHsgbnNVUkwgfSwgc3RyaW5nIH07CisgICAgcmV0dXJuIChfX2JyaWRnZSBOU1VS TCopIHVybC5jcmVhdGVDRlVSTCgpLmF1dG9yZWxlYXNlKCk7CiB9CiAKIE5TVVJMICpVUkxXaXRo VXNlclR5cGVkU3RyaW5nRGVwcmVjYXRlZChOU1N0cmluZyAqc3RyaW5nLCBOU1VSTCAqVVJMKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV0tOU1VSTEV4dHJhcy5tbSBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dLTlNVUkxFeHRyYXMubW0KaW5kZXggNTZkNDkx MGRjZTE2YTMzODViNGY4MTdlMDYwNDgxMmM2NjQzMDM4My4uODk1YWZlOTkyNjM2ODNhNWQzMmU3 ZjAyYjQ5NTM2ZDNiNmE1YTM2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29j b2EvV0tOU1VSTEV4dHJhcy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XS05T VVJMRXh0cmFzLm1tCkBAIC0yNyw2ICsyNyw3IEBACiAjaW1wb3J0ICJXS05TVVJMRXh0cmFzLmgi CiAKICNpbXBvcnQgPFdlYkNvcmUvQ0ZVUkxFeHRyYXMuaD4KKyNpbXBvcnQgPFdlYkNvcmUvVVJM Lmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9XVEZT dHJpbmcuaD4KIApAQCAtMzQsMjMgKzM1LDE2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwog CiBAaW1wbGVtZW50YXRpb24gTlNVUkwgKFdLRXh0cmFzKQogCi1zdGF0aWMgaW5saW5lIE5TVVJM ICp1cmxXaXRoV1RGU3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBOU1VSTCAqYmFzZVVSTCA9 IG5pbCkKLXsKLSAgICBpZiAoIXN0cmluZykKLSAgICAgICAgcmV0dXJuIG5pbDsKLQotICAgIENT dHJpbmcgYnVmZmVyID0gc3RyaW5nLnV0ZjgoKTsKLSAgICByZXR1cm4gKE5TVVJMICopY3JlYXRl Q0ZVUkxGcm9tQnVmZmVyKGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5sZW5ndGgoKSwgKENGVVJMUmVm KWJhc2VVUkwpLmF1dG9yZWxlYXNlKCk7Ci19Ci0KICsgKGluc3RhbmNldHlwZSlfd2ViX1VSTFdp dGhXVEZTdHJpbmc6KGNvbnN0IFN0cmluZyYpc3RyaW5nCiB7Ci0gICAgcmV0dXJuIHVybFdpdGhX VEZTdHJpbmcoc3RyaW5nKTsKKyAgICBVUkwgdXJsIHsgVVJMIHsgfSwgc3RyaW5nIH07CisgICAg cmV0dXJuIChfX2JyaWRnZSBOU1VSTCopIHVybC5jcmVhdGVDRlVSTCgpLmF1dG9yZWxlYXNlKCk7 CiB9CiAKICsgKGluc3RhbmNldHlwZSlfd2ViX1VSTFdpdGhXVEZTdHJpbmc6KGNvbnN0IFN0cmlu ZyYpc3RyaW5nIHJlbGF0aXZlVG9VUkw6KE5TVVJMICopYmFzZVVSTAogewotICAgIHJldHVybiB1 cmxXaXRoV1RGU3RyaW5nKHN0cmluZywgYmFzZVVSTCk7CisgICAgVVJMIHVybCB7IFVSTCB7IGJh c2VVUkwgfSwgc3RyaW5nIH07CisgICAgcmV0dXJuIChfX2JyaWRnZSBOU1VSTCopIHVybC5jcmVh dGVDRlVSTCgpLmF1dG9yZWxlYXNlKCk7CiB9CiAKIC0gKFN0cmluZylfd2ViX29yaWdpbmFsRGF0 YUFzV1RGU3RyaW5nCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VM b2cKaW5kZXggNWEyNWU1NzM5YTViZmQ2YWY3ZTdhNWI4NGJiYjBlNGMwY2UzZTgyNi4uZWE3NTM2 ZWU3ZTczMGVhMGE4ZGU0OTYxN2I0NmZhYTM2NzEzNTkwYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hh bmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA1LTI5 ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBjb25z aXN0ZW5jeSBjaGVjayBiZXR3ZWVuIFVSTCBhbmQgQ0ZVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjQ0NAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMzcxNjQ4MzU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRFJUIGNvZGUgZXhwZWN0ZWQgYSBub24gbnVsbCBVUkwgd2hpY2ggaXMgbm8gbG9uZ2Vy IHRoZSBjYXNlIG5vdy4KKyAgICAgICAgVXBkYXRlZCBEUlQgdG8gcmVtb3ZlIHRoYXQgYXNzdW1w dGlvbi4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuY3BwOgorICAgICAg ICAoVGVzdFJ1bm5lcjo6cmVkaXJlY3Rpb25EZXN0aW5hdGlvbkZvclVSTCk6CisgICAgICAgICog RHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5lci5oOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21h Yy9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbToKKyAgICAgICAgKC1bUmVzb3VyY2VMb2FkRGVsZWdh dGUgd2ViVmlldzpyZXNvdXJjZTp3aWxsU2VuZFJlcXVlc3Q6cmVkaXJlY3RSZXNwb25zZTpmcm9t RGF0YVNvdXJjZTpdKToKKwogMjAxOC0wNS0yOSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxl LmNvbT4KIAogICAgICAgICBVbmFibGUgdG8gcmVtb3ZlIEluZGV4ZWREQiBEYXRhYmFzZXMgd2l0 aCBDb2NvYSBBUEkgcmVtb3ZlRGF0YU9mVHlwZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL1Rlc3RSdW5uZXIuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5lci5j cHAKaW5kZXggNzA3YTZiOTI1M2QxZmZhZTg1YWNiMjAxZTM5NTRhZWM1NDFjZTdiYS4uZjhhZDk1 MTUxNzQwYjY2Yzc0NjkyYWQ1MmQzNzRhMzA1ZGE0NDY3MSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvVGVzdFJ1bm5lci5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVz dFJ1bm5lci5jcHAKQEAgLTIzMzUsOSArMjMzNSwxNiBAQCB2b2lkIFRlc3RSdW5uZXI6OmFkZFVS TFRvUmVkaXJlY3Qoc3RkOjpzdHJpbmcgb3JpZ2luLCBzdGQ6OnN0cmluZyBkZXN0aW5hdGlvbikK ICAgICBtX1VSTHNUb1JlZGlyZWN0W29yaWdpbl0gPSBkZXN0aW5hdGlvbjsKIH0KIAotY29uc3Qg c3RkOjpzdHJpbmcmIFRlc3RSdW5uZXI6OnJlZGlyZWN0aW9uRGVzdGluYXRpb25Gb3JVUkwoc3Rk OjpzdHJpbmcgb3JpZ2luKQorY29uc3QgY2hhciogVGVzdFJ1bm5lcjo6cmVkaXJlY3Rpb25EZXN0 aW5hdGlvbkZvclVSTChjb25zdCBjaGFyKiBvcmlnaW4pCiB7Ci0gICAgcmV0dXJuIG1fVVJMc1Rv UmVkaXJlY3Rbb3JpZ2luXTsKKyAgICBpZiAoIW9yaWdpbikKKyAgICAgICAgcmV0dXJuIG51bGxw dHI7CisKKyAgICBhdXRvIGl0ZXJhdG9yID0gbV9VUkxzVG9SZWRpcmVjdC5maW5kKG9yaWdpbik7 CisgICAgaWYgKGl0ZXJhdG9yID09IG1fVVJMc1RvUmVkaXJlY3QuZW5kKCkpCisgICAgICAgIHJl dHVybiBudWxscHRyOworCisgICAgcmV0dXJuIGl0ZXJhdG9yLT5zZWNvbmQuZGF0YSgpOwogfQog CiB2b2lkIFRlc3RSdW5uZXI6OnNldFNob3VsZFBhaW50QnJva2VuSW1hZ2UoYm9vbCBzaG91bGRQ YWludEJyb2tlbkltYWdlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdFJ1 bm5lci5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5lci5oCmluZGV4IDFlOGMxZTk0 ZjZjYjQ3MzVjOGY0OGEwNzAyNDk0Zjc4ODA5OTE0MWIuLjNlMzI4YjgyMjMyM2ZlYzRiNGI1NGY3 NzdhY2VkMjQzNDY0NmI2YzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RS dW5uZXIuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0UnVubmVyLmgKQEAgLTU5LDcg KzU5LDcgQEAgcHVibGljOgogICAgIGNvbnN0IHN0ZDo6c2V0PHN0ZDo6c3RyaW5nPiYgYWxsb3dl ZEhvc3RzKCkgY29uc3QgeyByZXR1cm4gbV9hbGxvd2VkSG9zdHM7IH0KICAgICB2b2lkIHNldEFs bG93ZWRIb3N0cyhzdGQ6OnNldDxzdGQ6OnN0cmluZz4gaG9zdHMpIHsgbV9hbGxvd2VkSG9zdHMg PSBXVEZNb3ZlKGhvc3RzKTsgfQogICAgIHZvaWQgYWRkVVJMVG9SZWRpcmVjdChzdGQ6OnN0cmlu ZyBvcmlnaW4sIHN0ZDo6c3RyaW5nIGRlc3RpbmF0aW9uKTsKLSAgICBjb25zdCBzdGQ6OnN0cmlu ZyYgcmVkaXJlY3Rpb25EZXN0aW5hdGlvbkZvclVSTChzdGQ6OnN0cmluZyk7CisgICAgY29uc3Qg Y2hhciogcmVkaXJlY3Rpb25EZXN0aW5hdGlvbkZvclVSTChjb25zdCBjaGFyKik7CiAgICAgdm9p ZCBjbGVhckFsbEFwcGxpY2F0aW9uQ2FjaGVzKCk7CiAgICAgdm9pZCBjbGVhckFsbERhdGFiYXNl cygpOwogICAgIHZvaWQgY2xlYXJBcHBsaWNhdGlvbkNhY2hlRm9yT3JpZ2luKEpTU3RyaW5nUmVm IG5hbWUpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL1Jlc291cmNlTG9h ZERlbGVnYXRlLm1tIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL1Jlc291cmNlTG9hZERlbGVn YXRlLm1tCmluZGV4IDFiMzgzYmIzMDVmMGI3N2VmZTY2OTdkMTFhNDcyNDRmMGExOTM3YjguLjZj YjVmMjQyNjIzOTdiMjFkMTEwYWE1MGFkY2Q0N2E4OGIyNGMzZjkgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQorKysgYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9tYWMvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0KQEAgLTE4Miw5ICsxODIs OCBAQCAtKE5TVVJMUmVxdWVzdCAqKXdlYlZpZXc6IChXZWJWaWV3ICopd3YgcmVzb3VyY2U6aWRl bnRpZmllciB3aWxsU2VuZFJlcXVlc3Q6IChOUwogICAgICAgICBbbmV3UmVxdWVzdCBzZXRWYWx1 ZTpuaWwgZm9ySFRUUEhlYWRlckZpZWxkOm5zSGVhZGVyXTsKICAgICAgICAgW25zSGVhZGVyIHJl bGVhc2VdOwogICAgIH0KLSAgICBjb25zdCBzdGQ6OnN0cmluZyYgZGVzdGluYXRpb24gPSBnVGVz dFJ1bm5lci0+cmVkaXJlY3Rpb25EZXN0aW5hdGlvbkZvclVSTChbW3VybCBhYnNvbHV0ZVN0cmlu Z10gVVRGOFN0cmluZ10pOwotICAgIGlmIChkZXN0aW5hdGlvbi5sZW5ndGgoKSkKLSAgICAgICAg W25ld1JlcXVlc3Qgc2V0VVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdX aXRoVVRGOFN0cmluZzpkZXN0aW5hdGlvbi5kYXRhKCldXV07CisgICAgaWYgKGF1dG8qIGRlc3Rp bmF0aW9uID0gZ1Rlc3RSdW5uZXItPnJlZGlyZWN0aW9uRGVzdGluYXRpb25Gb3JVUkwoW1t1cmwg YWJzb2x1dGVTdHJpbmddIFVURjhTdHJpbmddKSkKKyAgICAgICAgW25ld1JlcXVlc3Qgc2V0VVJM OltOU1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoVVRGOFN0cmluZzpkZXN0 aW5hdGlvbl1dXTsKIAogICAgIHJldHVybiBbbmV3UmVxdWVzdCBhdXRvcmVsZWFzZV07CiB9Cg== 341537 2018-05-29 16:49:53 -0700 2018-05-29 17:18:46 -0700 Patch bug-186057-20180529164953.patch text/plain 12991 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmMwZWE3NGVjYjdkYzg5 YzIxYTNjMzIwYjUxMTUwNGMxZTJmNDNkZi4uZmE1NjgzZDgxZDE0YzFkMDNkOTg4NzY3NDkwNmYz MDkwYjk2OGMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTA1LTI3ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBjb25zaXN0ZW5j eSBjaGVjayBiZXR3ZWVuIFVSTCBhbmQgQ0ZVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjA1NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDAy NTg0NTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCisKKyAgICAgICAgSXQg aXMgaW1wb3J0YW50IHRoYXQgV2ViQ29yZTo6VVJMIHVzZWQgaW4gV2ViQ29yZSBhbmQgQ0ZVUkwg dGhhdCBnZXRzIHNlcmlhbGl6ZWQgaW4gdGhlIG5ldHdvcmsgcGlwZSByZW1haW4gY29uc2lzdGVu dC4KKyAgICAgICAgT3RoZXJ3aXNlLCB3ZSB3aWxsIGVuZC11cCB3aXRoIG9kZCBidWdzLgorCisg ICAgICAgIFdlIGFkZCBzdWNoIGEgY2hlY2sgd2hlbiBjcmVhdGluZyBhIENGVVJMIGZyb20gYW4g VVJMLgorICAgICAgICBUbyBtYWtlIHRoaW5ncyBtb3JlIGNvbnNpc3RlbnQsIHdlIGFsc28gcmVs eSBub3cgbW9yZSBvbiBXZWJDb3JlOjpVUkwgaW5zdGVhZCBvZiBkaXJlY3RseSBjcmVhdGluZyBh IENGVVJMLgorCisgICAgICAgICogcGxhdGZvcm0vVVJMLmg6CisgICAgICAgICogcGxhdGZvcm0v Y2YvQ0ZVUkxFeHRyYXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNDRlVSTFNhbWVPcmlnaW4p OgorICAgICAgICAqIHBsYXRmb3JtL2NmL0NGVVJMRXh0cmFzLmg6CisgICAgICAgICogcGxhdGZv cm0vY2YvVVJMQ0YuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VVJMOjpjcmVhdGVDRlVSTCBjb25z dCk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1VSTE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6 OlVSTDo6Y3JlYXRlQ0ZVUkwgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJDb3Jl TlNVUkxFeHRyYXMubW06CisgICAgICAgIChXZWJDb3JlOjpVUkxXaXRoVXNlclR5cGVkU3RyaW5n KToKKwogMjAxOC0wNS0yOSAgTmFuIFdhbmcgIDxuX3dhbmdAYXBwbGUuY29tPgogCiAgICAgICAg IEFYOiBzZXRWYWx1ZSBvbiBjb250ZW50ZWRpdGFibGUgc2hvdWxkIHByZXNlcnZlIHdoaXRlc3Bh Y2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKaW5kZXggMjNmZmFjN2Y3OTRjNTcwNzA2OGUwZTNkZTAxOWViZWI0NmEyZjA1Mi4u NTM2NWRjNDhmZTAzZjgwMzAwMWIyYzE1ZjMwMjE5MGY1ZjhkMjgwMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOC0wNS0yNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+ CisKKyAgICAgICAgQWRkIGEgY29uc2lzdGVuY3kgY2hlY2sgYmV0d2VlbiBVUkwgYW5kIENGVVJM CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYwNTcK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQwMjU4NDU3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IEdlb2ZmIEdhcmVuLgorCisgICAgICAgICogU2hhcmVkL0NvY29hL1dLTlNVUkxFeHRyYXMubW06 CisgICAgICAgICgrW05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpyZWxhdGl2ZVRvVVJMOl0p OgorICAgICAgICAodXJsV2l0aFdURlN0cmluZyk6IERlbGV0ZWQuCisgICAgICAgICgrW05TVVJM IF93ZWJfVVJMV2l0aFdURlN0cmluZzpdKTogRGVsZXRlZC4KKwogMjAxOC0wNS0yOSAgR2VvZmZy ZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZWQgc29tZSB1bnVz ZWQgV2ViU1FMIHRyYWNrZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9V UkwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5oCmluZGV4IGQ5YTAyYTY2OTIzNmY3 NmMyNjdjMGM1MmE2MGYyZDZlZjNhYTJjOTUuLmQxZTYwOWE3YzY3YmI3N2U4OTYzNmQ5YjI3YTU3 YmU5ZDBhN2ZmNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5oCkBAIC0xMjAsNiArMTIwLDcgQEAgcHVi bGljOgogICAgIGJvb2wgaGFzUGFzc3dvcmQoKSBjb25zdDsKICAgICBib29sIGhhc1F1ZXJ5KCkg Y29uc3Q7CiAgICAgYm9vbCBoYXNGcmFnbWVudCgpIGNvbnN0OworICAgIGJvb2wgaGFzUGF0aCgp IGNvbnN0OwogCiAgICAgLy8gVW5saWtlIHVzZXIoKSBhbmQgcGFzcygpLCB0aGVzZSBmdW5jdGlv bnMgZG9uJ3QgZGVjb2RlIGVzY2FwZSBzZXF1ZW5jZXMuCiAgICAgLy8gVGhpcyBpcyBuZWNlc3Nh cnkgZm9yIGFjY3VyYXRlIHJvdW5kLXRyaXBwaW5nLCBiZWNhdXNlIGVuY29kaW5nIGRvZXNuJ3Qg ZW5jb2RlICclJyBjaGFyYWN0ZXJzLgpAQCAtMjE3LDggKzIxOCw2IEBAIHByaXZhdGU6CiAgICAg dm9pZCBpbml0KGNvbnN0IFVSTCYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IFRleHRFbmNvZGluZyYp OwogICAgIHZvaWQgY29weVRvQnVmZmVyKFZlY3RvcjxjaGFyLCA1MTI+JiBidWZmZXIpIGNvbnN0 OwogCi0gICAgYm9vbCBoYXNQYXRoKCkgY29uc3Q7Ci0KICAgICBTdHJpbmcgbV9zdHJpbmc7CiAg ICAgYm9vbCBtX2lzVmFsaWQgOiAxOwogICAgIGJvb2wgbV9wcm90b2NvbElzSW5IVFRQRmFtaWx5 IDogMTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NGVVJMRXh0cmFz LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NGVVJMRXh0cmFzLmNwcAppbmRleCA5 MTc4Y2IxOTJmMDUzZTA2M2E4NmFmZWUzOGE3NjBmNzI4OWI1NGVlLi43M2I0M2JjN2EwN2I4MGFl NGJhYTM1ZmRiNzMzNWFjM2JhNzY0NDE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jZi9DRlVSTEV4dHJhcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2Yv Q0ZVUkxFeHRyYXMuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiQ0ZVUkxFeHRyYXMuaCIKIAorI2luY2x1ZGUgIlVSTC5oIgogI2luY2x1ZGUgPHd0 Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTksNCArNjAsMjIg QEAgdm9pZCBnZXRVUkxCeXRlcyhDRlVSTFJlZiB1cmwsIENTdHJpbmcmIHJlc3VsdCkKICAgICBB U1NFUlRfVU5VU0VEKGZpbmFsTGVuZ3RoLCBmaW5hbExlbmd0aCA9PSBieXRlc0xlbmd0aCk7CiB9 CiAKK2Jvb2wgaXNDRlVSTFNhbWVPcmlnaW4oQ0ZVUkxSZWYgY2ZVUkwsIGNvbnN0IFVSTCYgdXJs KQoreworICAgIEFTU0VSVCh1cmwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKTsKKworICAgIGlm ICh1cmwuaGFzVXNlcm5hbWUoKSB8fCB1cmwuaGFzUGFzc3dvcmQoKSkKKyAgICAgICAgcmV0dXJu IHByb3RvY29sSG9zdEFuZFBvcnRBcmVFcXVhbCh1cmwsIFVSTCB7IGNmVVJMIH0pOworCisgICAg VVJMQ2hhckJ1ZmZlciBieXRlczsKKyAgICBnZXRVUkxCeXRlcyhjZlVSTCwgYnl0ZXMpOworICAg IFN0cmluZ1ZpZXcgY2ZVUkxTdHJpbmcgeyByZWludGVycHJldF9jYXN0PGNvbnN0IExDaGFyKj4o Ynl0ZXMuZGF0YSgpKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGJ5dGVzLnNpemUoKSkgfTsKKwor ICAgIGlmICghdXJsLmhhc1BhdGgoKSkKKyAgICAgICAgcmV0dXJuIFN0cmluZ1ZpZXcgeyB1cmwu c3RyaW5nKCkgfSA9PSBjZlVSTFN0cmluZzsKKworICAgIGF1dG8gdXJsV2l0aG91dFBhdGggPSBT dHJpbmdWaWV3IHsgdXJsLnN0cmluZygpIH0uc3Vic3RyaW5nKDAsIHVybC5wYXRoU3RhcnQoKSAr IDEpOworICAgIHJldHVybiBjZlVSTFN0cmluZy5zdGFydHNXaXRoKHVybFdpdGhvdXRQYXRoKTsK K30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvQ0ZVUkxFeHRy YXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NGVVJMRXh0cmFzLmgKaW5kZXggZDVl NzJiZjUwZDM5NjljNDAwZTFmNWY2Y2MyNjkyN2E5OWY4ZTA1MS4uZmZkNTcwNjYwZGE2YWE5OGQx MjI4NjQwNzhmZWQ3ZGQ2ZTc3OWVmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2YvQ0ZVUkxFeHRyYXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9DRlVS TEV4dHJhcy5oCkBAIC0zMiwxMiArMzIsMTUgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitj bGFzcyBVUkw7CiB0eXBlZGVmIFZlY3RvcjxjaGFyLCA1MTI+IFVSTENoYXJCdWZmZXI7CiAKIFdF QkNPUkVfRVhQT1JUIFJldGFpblB0cjxDRlVSTFJlZj4gY3JlYXRlQ0ZVUkxGcm9tQnVmZmVyKGNv bnN0IGNoYXIqLCBzaXplX3QsIENGVVJMUmVmIGJhc2VVUkwgPSAwKTsKIFdFQkNPUkVfRVhQT1JU IHZvaWQgZ2V0VVJMQnl0ZXMoQ0ZVUkxSZWYsIFVSTENoYXJCdWZmZXImKTsKIFdFQkNPUkVfRVhQ T1JUIHZvaWQgZ2V0VVJMQnl0ZXMoQ0ZVUkxSZWYsIENTdHJpbmcmKTsKIAorYm9vbCBpc0NGVVJM U2FtZU9yaWdpbihDRlVSTFJlZiwgY29uc3QgVVJMJik7CisKIH0KIAogI2VuZGlmIC8vIENGVVJM RXh0cmFzX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL1VSTENGLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL1VSTENGLmNwcAppbmRleCA4ZmVkZWYyMjZm MWI5NGQxZGZmY2RlZTFiZTRkODg1YmQ3MTNmNzdjLi5hYjY0MWVkMmQ5YmVjMTNkNmExNzc4ZjYz NjYyZjliNjY3YTk3MWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9V UkxDRi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2YvVVJMQ0YuY3BwCkBAIC01 OSw3ICs1OSwxMiBAQCBSZXRhaW5QdHI8Q0ZVUkxSZWY+IFVSTDo6Y3JlYXRlQ0ZVUkwoKSBjb25z dAogICAgIC8vIHdoaWNoIGlzIGNsZWFybHkgd3JvbmcuCiAgICAgVVJMQ2hhckJ1ZmZlciBidWZm ZXI7CiAgICAgY29weVRvQnVmZmVyKGJ1ZmZlcik7Ci0gICAgcmV0dXJuIGNyZWF0ZUNGVVJMRnJv bUJ1ZmZlcihidWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpKTsKKyAgICBhdXRvIGNmVVJMID0g Y3JlYXRlQ0ZVUkxGcm9tQnVmZmVyKGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5zaXplKCkpOworCisg ICAgaWYgKHByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSAmJiAhaXNDRlVSTFNhbWVPcmlnaW4oY2ZV UkwuZ2V0KCksICp0aGlzKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICByZXR1cm4g Y2ZVUkw7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1VSTE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9VUkxNYWMubW0KaW5k ZXggZmM1YzQ2ZDYzMjczMDRhNzJkYmU0MTg1MmEwYmViN2JkN2EzYmE5Ny4uMjE2NDExNmJlMDMx OGFiOTdjN2RhYTI4OGI4OTBlZmVlZmYyYTQ3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1VSTE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv VVJMTWFjLm1tCkBAIC02OSwxNCArNjksMjIgQEAgUmV0YWluUHRyPENGVVJMUmVmPiBVUkw6OmNy ZWF0ZUNGVVJMKCkgY29uc3QKICAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Q0ZVUkxS ZWY+KGFkb3B0TlMoW1tOU1VSTCBhbGxvY10gaW5pdFdpdGhTdHJpbmc6QCIiXSkuZ2V0KCkpOwog ICAgIH0KIAorICAgIFJldGFpblB0cjxDRlVSTFJlZj4gY2ZVUkw7CisKICAgICAvLyBGYXN0IHBh dGggaWYgdGhlIGlucHV0IGRhdGEgaXMgOC1iaXQgdG8gYXZvaWQgY29weWluZyBpbnRvIGEgdGVt cG9yYXJ5IGJ1ZmZlci4KICAgICBpZiAoTElLRUxZKG1fc3RyaW5nLmlzOEJpdCgpKSkKLSAgICAg ICAgcmV0dXJuIGNyZWF0ZUNGVVJMRnJvbUJ1ZmZlcihyZWludGVycHJldF9jYXN0PGNvbnN0IGNo YXIqPihtX3N0cmluZy5jaGFyYWN0ZXJzOCgpKSwgbV9zdHJpbmcubGVuZ3RoKCkpOworICAgICAg ICBjZlVSTCA9IGNyZWF0ZUNGVVJMRnJvbUJ1ZmZlcihyZWludGVycHJldF9jYXN0PGNvbnN0IGNo YXIqPihtX3N0cmluZy5jaGFyYWN0ZXJzOCgpKSwgbV9zdHJpbmcubGVuZ3RoKCkpOworICAgIGVs c2UgeworICAgICAgICAvLyBTbG93ZXIgcGF0aC4KKyAgICAgICAgVVJMQ2hhckJ1ZmZlciBidWZm ZXI7CisgICAgICAgIGNvcHlUb0J1ZmZlcihidWZmZXIpOworICAgICAgICBjZlVSTCA9IGNyZWF0 ZUNGVVJMRnJvbUJ1ZmZlcihidWZmZXIuZGF0YSgpLCBidWZmZXIuc2l6ZSgpKTsKKyAgICB9CisK KyAgICBpZiAocHJvdG9jb2xJc0luSFRUUEZhbWlseSgpICYmICFpc0NGVVJMU2FtZU9yaWdpbihj ZlVSTC5nZXQoKSwgKnRoaXMpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIC8vIFNs b3dlciBwYXRoLgotICAgIFVSTENoYXJCdWZmZXIgYnVmZmVyOwotICAgIGNvcHlUb0J1ZmZlcihi dWZmZXIpOwotICAgIHJldHVybiBjcmVhdGVDRlVSTEZyb21CdWZmZXIoYnVmZmVyLmRhdGEoKSwg YnVmZmVyLnNpemUoKSk7CisgICAgcmV0dXJuIGNmVVJMOwogfQogCiBib29sIFVSTDo6aG9zdElz SVBBZGRyZXNzKGNvbnN0IFN0cmluZyYgaG9zdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9XZWJDb3JlTlNVUkxFeHRyYXMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvV2ViQ29yZU5TVVJMRXh0cmFzLm1tCmluZGV4IGU0ZmUzM2E1ZDQ1ODBkNTlmNGJl ZTUzZTE5YzczYjJlMGMyOGVjNmYuLjg4ZDljMGJhZjQ0NWM5N2MwNDBmNWI4ZTYzNmNlZGM4ZDRh NmJjZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlTlNV UkxFeHRyYXMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVOU1VS TEV4dHJhcy5tbQpAQCAtODg2LDcgKzg4Niw3IEBAIHN0YXRpYyBOU0RhdGEgKmRhdGFXaXRoVXNl clR5cGVkU3RyaW5nKE5TU3RyaW5nICpzdHJpbmcpCiAgICAgcmV0dXJuIFtOU0RhdGEgZGF0YVdp dGhCeXRlc05vQ29weTpvdXRCeXRlcyBsZW5ndGg6b3V0TGVuZ3RoXTsgLy8gYWRvcHRzIG91dEJ5 dGVzCiB9CiAKLU5TVVJMICpVUkxXaXRoVXNlclR5cGVkU3RyaW5nKE5TU3RyaW5nICpzdHJpbmcs IE5TVVJMICpVUkwpCitOU1VSTCAqVVJMV2l0aFVzZXJUeXBlZFN0cmluZyhOU1N0cmluZyAqc3Ry aW5nLCBOU1VSTCAqbnNVUkwpCiB7CiAgICAgaWYgKCFzdHJpbmcpCiAgICAgICAgIHJldHVybiBu aWw7CkBAIC04OTUsMTEgKzg5NSw4IEBAIE5TVVJMICpVUkxXaXRoVXNlclR5cGVkU3RyaW5nKE5T U3RyaW5nICpzdHJpbmcsIE5TVVJMICpVUkwpCiAgICAgaWYgKCFzdHJpbmcpCiAgICAgICAgIHJl dHVybiBuaWw7CiAKLSAgICBOU0RhdGEgKmRhdGEgPSBkYXRhV2l0aFVzZXJUeXBlZFN0cmluZyhz dHJpbmcpOwotICAgIGlmICghZGF0YSkKLSAgICAgICAgcmV0dXJuIFtOU1VSTCBVUkxXaXRoU3Ry aW5nOkAiIl07Ci0KLSAgICByZXR1cm4gVVJMV2l0aERhdGEoZGF0YSwgVVJMKTsKKyAgICBVUkwg dXJsIHsgVVJMIHsgbnNVUkwgfSwgc3RyaW5nIH07CisgICAgcmV0dXJuIChfX2JyaWRnZSBOU1VS TCopIHVybC5jcmVhdGVDRlVSTCgpLmF1dG9yZWxlYXNlKCk7CiB9CiAKIE5TVVJMICpVUkxXaXRo VXNlclR5cGVkU3RyaW5nRGVwcmVjYXRlZChOU1N0cmluZyAqc3RyaW5nLCBOU1VSTCAqVVJMKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV0tOU1VSTEV4dHJhcy5tbSBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dLTlNVUkxFeHRyYXMubW0KaW5kZXggNTZkNDkx MGRjZTE2YTMzODViNGY4MTdlMDYwNDgxMmM2NjQzMDM4My4uODk1YWZlOTkyNjM2ODNhNWQzMmU3 ZjAyYjQ5NTM2ZDNiNmE1YTM2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29j b2EvV0tOU1VSTEV4dHJhcy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XS05T VVJMRXh0cmFzLm1tCkBAIC0yNyw2ICsyNyw3IEBACiAjaW1wb3J0ICJXS05TVVJMRXh0cmFzLmgi CiAKICNpbXBvcnQgPFdlYkNvcmUvQ0ZVUkxFeHRyYXMuaD4KKyNpbXBvcnQgPFdlYkNvcmUvVVJM Lmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9XVEZT dHJpbmcuaD4KIApAQCAtMzQsMjMgKzM1LDE2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwog CiBAaW1wbGVtZW50YXRpb24gTlNVUkwgKFdLRXh0cmFzKQogCi1zdGF0aWMgaW5saW5lIE5TVVJM ICp1cmxXaXRoV1RGU3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBOU1VSTCAqYmFzZVVSTCA9 IG5pbCkKLXsKLSAgICBpZiAoIXN0cmluZykKLSAgICAgICAgcmV0dXJuIG5pbDsKLQotICAgIENT dHJpbmcgYnVmZmVyID0gc3RyaW5nLnV0ZjgoKTsKLSAgICByZXR1cm4gKE5TVVJMICopY3JlYXRl Q0ZVUkxGcm9tQnVmZmVyKGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5sZW5ndGgoKSwgKENGVVJMUmVm KWJhc2VVUkwpLmF1dG9yZWxlYXNlKCk7Ci19Ci0KICsgKGluc3RhbmNldHlwZSlfd2ViX1VSTFdp dGhXVEZTdHJpbmc6KGNvbnN0IFN0cmluZyYpc3RyaW5nCiB7Ci0gICAgcmV0dXJuIHVybFdpdGhX VEZTdHJpbmcoc3RyaW5nKTsKKyAgICBVUkwgdXJsIHsgVVJMIHsgfSwgc3RyaW5nIH07CisgICAg cmV0dXJuIChfX2JyaWRnZSBOU1VSTCopIHVybC5jcmVhdGVDRlVSTCgpLmF1dG9yZWxlYXNlKCk7 CiB9CiAKICsgKGluc3RhbmNldHlwZSlfd2ViX1VSTFdpdGhXVEZTdHJpbmc6KGNvbnN0IFN0cmlu ZyYpc3RyaW5nIHJlbGF0aXZlVG9VUkw6KE5TVVJMICopYmFzZVVSTAogewotICAgIHJldHVybiB1 cmxXaXRoV1RGU3RyaW5nKHN0cmluZywgYmFzZVVSTCk7CisgICAgVVJMIHVybCB7IFVSTCB7IGJh c2VVUkwgfSwgc3RyaW5nIH07CisgICAgcmV0dXJuIChfX2JyaWRnZSBOU1VSTCopIHVybC5jcmVh dGVDRlVSTCgpLmF1dG9yZWxlYXNlKCk7CiB9CiAKIC0gKFN0cmluZylfd2ViX29yaWdpbmFsRGF0 YUFzV1RGU3RyaW5nCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VM b2cKaW5kZXggNWEyNWU1NzM5YTViZmQ2YWY3ZTdhNWI4NGJiYjBlNGMwY2UzZTgyNi4uNmI1YzQ3 NGU0M2MwZTRmMTM0NDNjMmI0MjY1MWJhZDY3MGI5MjE0MiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hh bmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA1LTI5 ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBjb25z aXN0ZW5jeSBjaGVjayBiZXR3ZWVuIFVSTCBhbmQgQ0ZVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjQ0NAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMzcxNjQ4MzU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCisKKyAgICAg ICAgRFJUIGNvZGUgZXhwZWN0ZWQgYSBub24gbnVsbCBVUkwgd2hpY2ggaXMgbm8gbG9uZ2VyIHRo ZSBjYXNlIG5vdy4KKyAgICAgICAgVXBkYXRlZCBEUlQgdG8gcmVtb3ZlIHRoYXQgYXNzdW1wdGlv bi4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3RSdW5uZXIuY3BwOgorICAgICAgICAo VGVzdFJ1bm5lcjo6cmVkaXJlY3Rpb25EZXN0aW5hdGlvbkZvclVSTCk6CisgICAgICAgICogRHVt cFJlbmRlclRyZWUvVGVzdFJ1bm5lci5oOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9S ZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbToKKyAgICAgICAgKC1bUmVzb3VyY2VMb2FkRGVsZWdhdGUg d2ViVmlldzpyZXNvdXJjZTp3aWxsU2VuZFJlcXVlc3Q6cmVkaXJlY3RSZXNwb25zZTpmcm9tRGF0 YVNvdXJjZTpdKToKKwogMjAxOC0wNS0yOSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNv bT4KIAogICAgICAgICBVbmFibGUgdG8gcmVtb3ZlIEluZGV4ZWREQiBEYXRhYmFzZXMgd2l0aCBD b2NvYSBBUEkgcmVtb3ZlRGF0YU9mVHlwZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL1Rlc3RSdW5uZXIuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5lci5jcHAK aW5kZXggNzA3YTZiOTI1M2QxZmZhZTg1YWNiMjAxZTM5NTRhZWM1NDFjZTdiYS4uZjhhZDk1MTUx NzQwYjY2Yzc0NjkyYWQ1MmQzNzRhMzA1ZGE0NDY3MSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvVGVzdFJ1bm5lci5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdFJ1 bm5lci5jcHAKQEAgLTIzMzUsOSArMjMzNSwxNiBAQCB2b2lkIFRlc3RSdW5uZXI6OmFkZFVSTFRv UmVkaXJlY3Qoc3RkOjpzdHJpbmcgb3JpZ2luLCBzdGQ6OnN0cmluZyBkZXN0aW5hdGlvbikKICAg ICBtX1VSTHNUb1JlZGlyZWN0W29yaWdpbl0gPSBkZXN0aW5hdGlvbjsKIH0KIAotY29uc3Qgc3Rk OjpzdHJpbmcmIFRlc3RSdW5uZXI6OnJlZGlyZWN0aW9uRGVzdGluYXRpb25Gb3JVUkwoc3RkOjpz dHJpbmcgb3JpZ2luKQorY29uc3QgY2hhciogVGVzdFJ1bm5lcjo6cmVkaXJlY3Rpb25EZXN0aW5h dGlvbkZvclVSTChjb25zdCBjaGFyKiBvcmlnaW4pCiB7Ci0gICAgcmV0dXJuIG1fVVJMc1RvUmVk aXJlY3Rbb3JpZ2luXTsKKyAgICBpZiAoIW9yaWdpbikKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CisKKyAgICBhdXRvIGl0ZXJhdG9yID0gbV9VUkxzVG9SZWRpcmVjdC5maW5kKG9yaWdpbik7Cisg ICAgaWYgKGl0ZXJhdG9yID09IG1fVVJMc1RvUmVkaXJlY3QuZW5kKCkpCisgICAgICAgIHJldHVy biBudWxscHRyOworCisgICAgcmV0dXJuIGl0ZXJhdG9yLT5zZWNvbmQuZGF0YSgpOwogfQogCiB2 b2lkIFRlc3RSdW5uZXI6OnNldFNob3VsZFBhaW50QnJva2VuSW1hZ2UoYm9vbCBzaG91bGRQYWlu dEJyb2tlbkltYWdlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5l ci5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdFJ1bm5lci5oCmluZGV4IDFlOGMxZTk0ZjZj YjQ3MzVjOGY0OGEwNzAyNDk0Zjc4ODA5OTE0MWIuLjNlMzI4YjgyMjMyM2ZlYzRiNGI1NGY3Nzdh Y2VkMjQzNDY0NmI2YzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RSdW5u ZXIuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0UnVubmVyLmgKQEAgLTU5LDcgKzU5 LDcgQEAgcHVibGljOgogICAgIGNvbnN0IHN0ZDo6c2V0PHN0ZDo6c3RyaW5nPiYgYWxsb3dlZEhv c3RzKCkgY29uc3QgeyByZXR1cm4gbV9hbGxvd2VkSG9zdHM7IH0KICAgICB2b2lkIHNldEFsbG93 ZWRIb3N0cyhzdGQ6OnNldDxzdGQ6OnN0cmluZz4gaG9zdHMpIHsgbV9hbGxvd2VkSG9zdHMgPSBX VEZNb3ZlKGhvc3RzKTsgfQogICAgIHZvaWQgYWRkVVJMVG9SZWRpcmVjdChzdGQ6OnN0cmluZyBv cmlnaW4sIHN0ZDo6c3RyaW5nIGRlc3RpbmF0aW9uKTsKLSAgICBjb25zdCBzdGQ6OnN0cmluZyYg cmVkaXJlY3Rpb25EZXN0aW5hdGlvbkZvclVSTChzdGQ6OnN0cmluZyk7CisgICAgY29uc3QgY2hh ciogcmVkaXJlY3Rpb25EZXN0aW5hdGlvbkZvclVSTChjb25zdCBjaGFyKik7CiAgICAgdm9pZCBj bGVhckFsbEFwcGxpY2F0aW9uQ2FjaGVzKCk7CiAgICAgdm9pZCBjbGVhckFsbERhdGFiYXNlcygp OwogICAgIHZvaWQgY2xlYXJBcHBsaWNhdGlvbkNhY2hlRm9yT3JpZ2luKEpTU3RyaW5nUmVmIG5h bWUpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL1Jlc291cmNlTG9hZERl bGVnYXRlLm1tIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL1Jlc291cmNlTG9hZERlbGVnYXRl Lm1tCmluZGV4IDFiMzgzYmIzMDVmMGI3N2VmZTY2OTdkMTFhNDcyNDRmMGExOTM3YjguLjZjYjVm MjQyNjIzOTdiMjFkMTEwYWE1MGFkY2Q0N2E4OGIyNGMzZjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL21hYy9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQorKysgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9tYWMvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0KQEAgLTE4Miw5ICsxODIsOCBA QCAtKE5TVVJMUmVxdWVzdCAqKXdlYlZpZXc6IChXZWJWaWV3ICopd3YgcmVzb3VyY2U6aWRlbnRp ZmllciB3aWxsU2VuZFJlcXVlc3Q6IChOUwogICAgICAgICBbbmV3UmVxdWVzdCBzZXRWYWx1ZTpu aWwgZm9ySFRUUEhlYWRlckZpZWxkOm5zSGVhZGVyXTsKICAgICAgICAgW25zSGVhZGVyIHJlbGVh c2VdOwogICAgIH0KLSAgICBjb25zdCBzdGQ6OnN0cmluZyYgZGVzdGluYXRpb24gPSBnVGVzdFJ1 bm5lci0+cmVkaXJlY3Rpb25EZXN0aW5hdGlvbkZvclVSTChbW3VybCBhYnNvbHV0ZVN0cmluZ10g VVRGOFN0cmluZ10pOwotICAgIGlmIChkZXN0aW5hdGlvbi5sZW5ndGgoKSkKLSAgICAgICAgW25l d1JlcXVlc3Qgc2V0VVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRo VVRGOFN0cmluZzpkZXN0aW5hdGlvbi5kYXRhKCldXV07CisgICAgaWYgKGF1dG8qIGRlc3RpbmF0 aW9uID0gZ1Rlc3RSdW5uZXItPnJlZGlyZWN0aW9uRGVzdGluYXRpb25Gb3JVUkwoW1t1cmwgYWJz b2x1dGVTdHJpbmddIFVURjhTdHJpbmddKSkKKyAgICAgICAgW25ld1JlcXVlc3Qgc2V0VVJMOltO U1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoVVRGOFN0cmluZzpkZXN0aW5h dGlvbl1dXTsKIAogICAgIHJldHVybiBbbmV3UmVxdWVzdCBhdXRvcmVsZWFzZV07CiB9Cg==