170081 2017-03-24 15:58:35 -0700 Tighten RTCDatachannel creation and parameter getters 2017-03-27 11:13:27 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 169662 1 youennf youennf achristensen commit-queue eric.carlson jonlee oldest_to_newest 1291027 0 youennf 2017-03-24 15:58:35 -0700 Tighten RTCDatachannel creation and parameter getters 1291029 1 305330 youennf 2017-03-24 16:00:47 -0700 Created attachment 305330 Patch 1291050 2 305330 eric.carlson 2017-03-24 16:24:23 -0700 Comment on attachment 305330 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=305330&action=review > Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp:335 > + if (options.negotiated && !options.negotiated.value() && (label.length() > 65535 || options.protocol.length() > 65535)) USHRT_MAX? > Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp:341 > + if (options.id && options.id.value() > 65534) ">= USHRT_MAX"? If not, a named constant would be nice to make it obvious what this limit represents. 1291051 3 305330 eric.carlson 2017-03-24 16:24:47 -0700 Comment on attachment 305330 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=305330&action=review > LayoutTests/webrtc/datachannel/basic.html:203 > + > + Nit: extra blank line. 1291078 4 youennf 2017-03-24 16:51:41 -0700 Thanks for the review. The values are literally from the spec, I am not sure it is worth moving away from the spec 1291510 5 305481 youennf 2017-03-27 10:30:16 -0700 Created attachment 305481 Patch for landing 1291512 6 youennf 2017-03-27 10:30:51 -0700 Thanks for the review. (In reply to Eric Carlson from comment #3) > Comment on attachment 305330 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=305330&action=review > > > LayoutTests/webrtc/datachannel/basic.html:203 > > + > > + > > Nit: extra blank line. Done 1291532 7 305481 commit-queue 2017-03-27 11:13:23 -0700 Comment on attachment 305481 Patch for landing Clearing flags on attachment: 305481 Committed r214421: <http://trac.webkit.org/changeset/214421> 1291533 8 commit-queue 2017-03-27 11:13:27 -0700 All reviewed patches have been landed. Closing bug. 305330 2017-03-24 16:00:47 -0700 2017-03-27 10:30:13 -0700 Patch bug-170081-20170324160046.patch text/plain 15676 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmNlZTNlNGE1YWMzN2Vk NGMxNDc5M2E5ZWUzNWRkOGFjY2JhMTY1OS4uYTcyZTNkZjI4ZTk5Nzg4ZGJkMzlmYzRlZmNmOTE0 YTQ5MThhMDUwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE3LTAzLTI0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBUaWdodGVuIFJUQ0RhdGFj aGFubmVsIGNyZWF0aW9uIGFuZCBwYXJhbWV0ZXIgZ2V0dGVycworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMDgxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSB1cGRhdGVkIHRlc3RzLgor CisgICAgICAgIEFkZGluZyBzb21lIHBhcmFtZXRlciBjaGVja3Mgd2hlbiBjcmVhdGluZyBkYXRh IGNoYW5uZWxzLgorICAgICAgICBNYWtpbmcgc29tZSBnZXR0ZXJzIG51bGxhYmxlIGFzIHBlciB0 aGUgc3BlYy4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWwu aDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsLmlkbDoKKyAg ICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uOjpjcmVhdGVEYXRhQ2hhbm5lbCk6CisgICAg ICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5pZGw6CisgICAgICAg ICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpjcmVhdGVEYXRh Q2hhbm5lbCk6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50OjphZGRE YXRhQ2hhbm5lbCk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5u ZWxIYW5kbGVyLmg6CisgICAgICAgICgpOiBEZWxldGVkLgorCisyMDE3LTAzLTI0ICBZb3Vlbm4g RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKwogICAgICAgICBBZGQgbGlid2VicnRjIGJhY2tl bmQgc3VwcG9ydCBmb3IgUlRDUnRwU2VuZGVyOjpyZXBsYWNlVHJhY2sKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTg0MQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsLmggYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsLmgKaW5kZXggY2Q4 NjBmMTg0ZDJlZTM1NWYwODc2OGY5MmJiNGUwOTBmNzQ4NDAzMi4uYzk0ZjZiOTM4ZTVhNzg4NjFl MzRiMzUzZDliZWIxNjBmZTA4YjgxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWwuaApAQCAtNDgsMTIgKzQ4LDEyIEBAIGNsYXNz IFJUQ0RhdGFDaGFubmVsIGZpbmFsIDogcHVibGljIFJUQ0RhdGFDaGFubmVsSGFuZGxlckNsaWVu dCwgcHVibGljIEV2ZW50VGFyCiBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxSVENEYXRhQ2hhbm5l bD4gY3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBzdGQ6OnVuaXF1ZV9wdHI8UlRDRGF0 YUNoYW5uZWxIYW5kbGVyPiYmLCBTdHJpbmcmJiwgUlRDRGF0YUNoYW5uZWxJbml0JiYpOwogCi0g ICAgYm9vbCBvcmRlcmVkKCkgY29uc3QgeyByZXR1cm4gbV9vcHRpb25zLm9yZGVyZWQ7IH0KLSAg ICB1bnNpZ25lZCBzaG9ydCBtYXhSZXRyYW5zbWl0VGltZSgpIGNvbnN0IHsgcmV0dXJuIG1fb3B0 aW9ucy5tYXhSZXRyYW5zbWl0VGltZTsgfQotICAgIHVuc2lnbmVkIHNob3J0IG1heFJldHJhbnNt aXRzKCkgY29uc3QgeyByZXR1cm4gbV9vcHRpb25zLm1heFJldHJhbnNtaXRzOyB9CisgICAgYm9v bCBvcmRlcmVkKCkgY29uc3QgeyByZXR1cm4gKm1fb3B0aW9ucy5vcmRlcmVkOyB9CisgICAgc3Rk OjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4gbWF4UGFja2V0TGlmZVRpbWUoKSBjb25zdCB7IHJl dHVybiBtX29wdGlvbnMubWF4UGFja2V0TGlmZVRpbWU7IH0KKyAgICBzdGQ6Om9wdGlvbmFsPHVu c2lnbmVkIHNob3J0PiBtYXhSZXRyYW5zbWl0cygpIGNvbnN0IHsgcmV0dXJuIG1fb3B0aW9ucy5t YXhSZXRyYW5zbWl0czsgfQogICAgIFN0cmluZyBwcm90b2NvbCgpIGNvbnN0IHsgcmV0dXJuIG1f b3B0aW9ucy5wcm90b2NvbDsgfQotICAgIGJvb2wgbmVnb3RpYXRlZCgpIGNvbnN0IHsgcmV0dXJu IG1fb3B0aW9ucy5uZWdvdGlhdGVkOyB9OwotICAgIHVuc2lnbmVkIHNob3J0IGlkKCkgY29uc3Qg eyByZXR1cm4gbV9vcHRpb25zLmlkOyB9OworICAgIGJvb2wgbmVnb3RpYXRlZCgpIGNvbnN0IHsg cmV0dXJuICptX29wdGlvbnMubmVnb3RpYXRlZDsgfTsKKyAgICBzdGQ6Om9wdGlvbmFsPHVuc2ln bmVkIHNob3J0PiBpZCgpIGNvbnN0IHsgcmV0dXJuIG1fb3B0aW9ucy5pZDsgfTsKIAogICAgIFN0 cmluZyBsYWJlbCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFiZWw7IH0KICAgICBjb25zdCBBdG9taWNT dHJpbmcmIHJlYWR5U3RhdGUoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWwuaWRsIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbC5pZGwKaW5kZXggZTc3OGMwZjk2ZDMzZDE1 MWEyNjgxODY1OGMwZjZiMzAyZDBjOTA5NC4uNzgzMjFlYTk5NTIwOTlkNTIzZDMwNGE4YjQ2Y2Zm NWJmYWI2MmM3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9SVENEYXRhQ2hhbm5lbC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9SVENEYXRhQ2hhbm5lbC5pZGwKQEAgLTI4LDExICsyOCwxMSBAQAogXSBpbnRlcmZhY2Ug UlRDRGF0YUNoYW5uZWwgOiBFdmVudFRhcmdldCB7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERP TVN0cmluZyBsYWJlbDsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgYm9vbGVhbiBvcmRlcmVkOwot ICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBzaG9ydCBtYXhSZXRyYW5zbWl0VGltZTsK LSAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgc2hvcnQgbWF4UmV0cmFuc21pdHM7Cisg ICAgcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIHNob3J0PyBtYXhQYWNrZXRMaWZlVGltZTsK KyAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgc2hvcnQ/IG1heFJldHJhbnNtaXRzOwog ICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgcHJvdG9jb2w7CiAgICAgcmVhZG9ubHkg YXR0cmlidXRlIGJvb2xlYW4gbmVnb3RpYXRlZDsKLSAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5z aWduZWQgc2hvcnQgaWQ7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIHNob3J0PyBp ZDsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIHJlYWR5U3RhdGU7CiAgICAgcmVh ZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgYnVmZmVyZWRBbW91bnQ7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlv bi5jcHAKaW5kZXggMzg2MGRhYWIxNzQ0NTI4MmExOTRkMjNjNmFiM2YyYWZmM2M2NzgzYS4uYjhk ZjM1NzhmZTcwODUzMjMxMmI1YWIwZTRlNmUxYjFhZDU5MzRmMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHAK QEAgLTMzMiw3ICszMzIsMTUgQEAgRXhjZXB0aW9uT3I8UmVmPFJUQ0RhdGFDaGFubmVsPj4gUlRD UGVlckNvbm5lY3Rpb246OmNyZWF0ZURhdGFDaGFubmVsKFNjcmlwdEV4ZWMKICAgICBpZiAobV9z aWduYWxpbmdTdGF0ZSA9PSBSVENTaWduYWxpbmdTdGF0ZTo6Q2xvc2VkKQogICAgICAgICByZXR1 cm4gRXhjZXB0aW9uIHsgSU5WQUxJRF9TVEFURV9FUlIgfTsKIAotICAgIC8vIEZJWE1FOiBDaGVj ayBvcHRpb25zCisgICAgaWYgKG9wdGlvbnMubmVnb3RpYXRlZCAmJiAhb3B0aW9ucy5uZWdvdGlh dGVkLnZhbHVlKCkgJiYgKGxhYmVsLmxlbmd0aCgpID4gNjU1MzUgfHwgb3B0aW9ucy5wcm90b2Nv bC5sZW5ndGgoKSA+IDY1NTM1KSkKKyAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFR5cGVFcnJv ciB9OworCisgICAgaWYgKG9wdGlvbnMubWF4UGFja2V0TGlmZVRpbWUgJiYgb3B0aW9ucy5tYXhS ZXRyYW5zbWl0cykKKyAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFR5cGVFcnJvciB9OworCisg ICAgaWYgKG9wdGlvbnMuaWQgJiYgb3B0aW9ucy5pZC52YWx1ZSgpID4gNjU1MzQpCisgICAgICAg IHJldHVybiBFeGNlcHRpb24geyBUeXBlRXJyb3IgfTsKKyAgICAKICAgICBhdXRvIGNoYW5uZWxI YW5kbGVyID0gbV9iYWNrZW5kLT5jcmVhdGVEYXRhQ2hhbm5lbEhhbmRsZXIobGFiZWwsIG9wdGlv bnMpOwogICAgIGlmICghY2hhbm5lbEhhbmRsZXIpCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24g eyBOT1RfU1VQUE9SVEVEX0VSUiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmlkbAppbmRleCBmOTU3MDkzOTMzY2Zk NGUxMmVjMzY2Yzg2YWIzNjcyMzdjNTAyNmM1Li43ODUxNzkyODUxMDI5MDhjN2M1YjJkYjVmYzI0 ZjZiMTJkZjkxNTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmlkbApAQCAtMzgsOCArMzgsNyBAQCB0eXBlZGVm IFJUQ1J0cFRyYW5zY2VpdmVyRGlyZWN0aW9uIFJ0cFRyYW5zY2VpdmVyRGlyZWN0aW9uOwogICAg IEVuYWJsZWRBdFJ1bnRpbWU9UGVlckNvbm5lY3Rpb24KIF0gZGljdGlvbmFyeSBSVENEYXRhQ2hh bm5lbEluaXQgewogICAgIGJvb2xlYW4gb3JkZXJlZCA9IHRydWU7Ci0gICAgLy8gRklYTUUgMTY5 NjQ0OiByZW5hbWUgdG8gbWF4UGFja2V0TGlmZVRpbWU7Ci0gICAgdW5zaWduZWQgc2hvcnQgbWF4 UmV0cmFuc21pdFRpbWU7CisgICAgdW5zaWduZWQgc2hvcnQgbWF4UGFja2V0TGlmZVRpbWU7CiAg ICAgdW5zaWduZWQgc2hvcnQgbWF4UmV0cmFuc21pdHM7CiAgICAgVVNWU3RyaW5nIHByb3RvY29s ID0gIiI7CiAgICAgYm9vbGVhbiBuZWdvdGlhdGVkID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVu ZHBvaW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRj L0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCmluZGV4IDA0YzYwMmU2MmJiMmU4MTQ5NjI5ZjM2 NjkzN2UwMDM1ZWJlZDk0NTMuLmY2YjljMGFiZDc0MTVmMjk2MTA0MDgwZDJhYTI2NjJhZGQxMzU3 NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2Vi cnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCkBAIC01 NDcsMTIgKzU0NywxNyBAQCB2b2lkIExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6Ok9uQWRkVHJhY2so cnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6UnRwUmVjZWl2ZXJJbgogc3RkOjp1bmlxdWVfcHRy PFJUQ0RhdGFDaGFubmVsSGFuZGxlcj4gTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6Y3JlYXRlRGF0 YUNoYW5uZWwoY29uc3QgU3RyaW5nJiBsYWJlbCwgY29uc3QgUlRDRGF0YUNoYW5uZWxJbml0JiBv cHRpb25zKQogewogICAgIHdlYnJ0Yzo6RGF0YUNoYW5uZWxJbml0IGluaXQ7Ci0gICAgaW5pdC5v cmRlcmVkID0gb3B0aW9ucy5vcmRlcmVkOwotICAgIGluaXQubWF4UmV0cmFuc21pdFRpbWUgPSBv cHRpb25zLm1heFJldHJhbnNtaXRUaW1lOwotICAgIGluaXQubWF4UmV0cmFuc21pdHMgPSBvcHRp b25zLm1heFJldHJhbnNtaXRzOworICAgIGlmIChvcHRpb25zLm9yZGVyZWQpCisgICAgICAgIGlu aXQub3JkZXJlZCA9ICpvcHRpb25zLm9yZGVyZWQ7CisgICAgaWYgKG9wdGlvbnMubWF4UGFja2V0 TGlmZVRpbWUpCisgICAgICAgIGluaXQubWF4UmV0cmFuc21pdFRpbWUgPSAqb3B0aW9ucy5tYXhQ YWNrZXRMaWZlVGltZTsKKyAgICBpZiAob3B0aW9ucy5tYXhSZXRyYW5zbWl0cykKKyAgICAgICAg aW5pdC5tYXhSZXRyYW5zbWl0cyA9ICpvcHRpb25zLm1heFJldHJhbnNtaXRzOwogICAgIGluaXQu cHJvdG9jb2wgPSBvcHRpb25zLnByb3RvY29sLnV0ZjgoKS5kYXRhKCk7Ci0gICAgaW5pdC5uZWdv dGlhdGVkID0gb3B0aW9ucy5uZWdvdGlhdGVkOwotICAgIGluaXQuaWQgPSBvcHRpb25zLmlkOwor ICAgIGlmIChvcHRpb25zLm5lZ290aWF0ZWQpCisgICAgICAgIGluaXQubmVnb3RpYXRlZCA9ICpv cHRpb25zLm5lZ290aWF0ZWQ7CisgICAgaWYgKG9wdGlvbnMuaWQpCisgICAgICAgIGluaXQuaWQg PSAqb3B0aW9ucy5pZDsKIAogICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPExpYldlYlJUQ0Rh dGFDaGFubmVsSGFuZGxlcj4obV9iYWNrZW5kLT5DcmVhdGVEYXRhQ2hhbm5lbChsYWJlbC51dGY4 KCkuZGF0YSgpLCAmaW5pdCkpOwogfQpAQCAtNTY0LDcgKzU2OSw3IEBAIHZvaWQgTGliV2ViUlRD TWVkaWFFbmRwb2ludDo6YWRkRGF0YUNoYW5uZWwocnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6 RGF0YUNoYW5uCiAKICAgICBSVENEYXRhQ2hhbm5lbEluaXQgaW5pdDsKICAgICBpbml0Lm9yZGVy ZWQgPSBkYXRhQ2hhbm5lbC0+b3JkZXJlZCgpOwotICAgIGluaXQubWF4UmV0cmFuc21pdFRpbWUg PSBkYXRhQ2hhbm5lbC0+bWF4UmV0cmFuc21pdFRpbWUoKTsKKyAgICBpbml0Lm1heFBhY2tldExp ZmVUaW1lID0gZGF0YUNoYW5uZWwtPm1heFJldHJhbnNtaXRUaW1lKCk7CiAgICAgaW5pdC5tYXhS ZXRyYW5zbWl0cyA9IGRhdGFDaGFubmVsLT5tYXhSZXRyYW5zbWl0cygpOwogICAgIGluaXQucHJv dG9jb2wgPSBTdHJpbmcocHJvdG9jb2wuZGF0YSgpLCBwcm90b2NvbC5zaXplKCkpOwogICAgIGlu aXQubmVnb3RpYXRlZCA9IGRhdGFDaGFubmVsLT5uZWdvdGlhdGVkKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbEhhbmRsZXIu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsSGFu ZGxlci5oCmluZGV4IGU0NjU1ZGQzMGQzMzE4NjJkZDhhZGM5NzhkOTVkNTdjZGEyMDk4YTEuLmZk MzU3NzgwMzZhMTk2MDdkYzE4MzliNGI4ZjkzZGE5ZjMwM2VlNjIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsSGFuZGxlci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsSGFu ZGxlci5oCkBAIC0yNiwxNyArMjYsMTggQEAKIAogI2lmIEVOQUJMRShXRUJfUlRDKQogCisjaW5j bHVkZSA8d3RmL09wdGlvbmFsLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IFJUQ0RhdGFDaGFubmVsSW5pdCB7Ci0gICAg Ym9vbCBvcmRlcmVkIHsgdHJ1ZSB9OwotICAgIGludCBtYXhSZXRyYW5zbWl0VGltZSB7IC0xIH07 Ci0gICAgaW50IG1heFJldHJhbnNtaXRzIHsgLTEgfTsKKyAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+ IG9yZGVyZWQ7CisgICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4gbWF4UGFja2V0TGlm ZVRpbWU7CisgICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4gbWF4UmV0cmFuc21pdHM7 CiAgICAgU3RyaW5nIHByb3RvY29sOwotICAgIGJvb2wgbmVnb3RpYXRlZCB7IGZhbHNlIH07Ci0g ICAgaW50IGlkIHsgLTEgfTsKKyAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IG5lZ290aWF0ZWQ7Cisg ICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4gaWQ7CiB9OwogCiBjbGFzcyBSVENEYXRh Q2hhbm5lbEhhbmRsZXJDbGllbnQ7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWVmNmEzNGUwNTc3OTVkMzdmYTI0OGRjMjNj MDU1YzhkOTEwNjc4YS4uZGQyY2RhNjgwMmU3ZjJkYzdkYjcyZGMyNWE0OGYzN2U4ODdmOTcwMCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDE3LTAzLTI0ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u QGFwcGxlLmNvbT4KIAorICAgICAgICBUaWdodGVuIFJUQ0RhdGFjaGFubmVsIGNyZWF0aW9uIGFu ZCBwYXJhbWV0ZXIgZ2V0dGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcwMDgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiB3ZWJydGMvZGF0YWNoYW5uZWwvYmFzaWMtZXhwZWN0ZWQudHh0OgorICAg ICAgICAqIHdlYnJ0Yy9kYXRhY2hhbm5lbC9iYXNpYy5odG1sOgorCisyMDE3LTAzLTI0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKwogICAgICAgICBBZGQgbGlid2VicnRjIGJh Y2tlbmQgc3VwcG9ydCBmb3IgUlRDUnRwU2VuZGVyOjpyZXBsYWNlVHJhY2sKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTg0MQogCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy93ZWJydGMvZGF0YWNoYW5uZWwvYmFzaWMtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvd2VicnRjL2RhdGFjaGFubmVsL2Jhc2ljLWV4cGVjdGVkLnR4dAppbmRleCAxNDIy ZGQwMmI0YTZkZWU3OGE0MzIxODUyODY1NTE3NjE1N2NjNmI0Li5lZDVhNGNkNDM3OTI3Y2M1YjA1 ZmFlMjZlYmRmZTNmYTU3YTYwYmMzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJydGMvZGF0 YWNoYW5uZWwvYmFzaWMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy9kYXRh Y2hhbm5lbC9iYXNpYy1leHBlY3RlZC50eHQKQEAgLTMsNCArMywxNSBAQCBQQVNTIEJhc2ljIGRh dGEgY2hhbm5lbCBleGNoYW5nZSBmcm9tIG9mZmVyZXIgdG8gcmVjZWl2ZXIKIFBBU1MgQmFzaWMg ZGF0YSBjaGFubmVsIGV4Y2hhbmdlIGZyb20gcmVjZWl2ZXIgdG8gb2ZmZXJlciAKIFBBU1MgQmFz aWMgZGF0YSBjaGFubmVsIGV4Y2hhbmdlIGZyb20gb2ZmZXJlciB0byByZWNlaXZlciB1c2luZyBV RFAgb25seSAKIFBBU1MgQmFzaWMgZGF0YSBjaGFubmVsIGV4Y2hhbmdlIGZyb20gb2ZmZXJlciB0 byByZWNlaXZlciB1c2luZyBUQ1Agb25seSAKK1BBU1MgQmFzaWMgZGF0YSBjaGFubmVsIGV4Y2hh bmdlIGZyb20gb2ZmZXJlciB0byByZWNlaXZlciAKK1BBU1MgQ3JlYXRpbmcgZGF0YSBjaGFubmVs IHdpdGggdmVyeSBsb25nIGxhYmVsIAorUEFTUyBDcmVhdGluZyBkYXRhIGNoYW5uZWwgYWZ0ZXIg Y2xvc2luZyB0aGUgY29ubmVjdGlvbiAKK1BBU1MgV3JvbmcgZGF0YSBjaGFubmVsIGluaXQ6IGxv bmcgcHJvdG9jb2wgCitQQVNTIFdyb25nIGRhdGEgY2hhbm5lbCBpbml0OiBsb25nIGlkIAorUEFT UyBXcm9uZyBkYXRhIGNoYW5uZWwgaW5pdDogbWF4UGFja2V0TGlmZVRpbWUgYW5kIG1heFJldHJh bnNtaXRzIAorUEFTUyBSaWdodCBkYXRhIGNoYW5uZWwgaW5pdDogb3JkZXJlZCBpbml0IAorUEFT UyBSaWdodCBkYXRhIGNoYW5uZWwgaW5pdDogdW5vcmRlcmVkIGluaXQgCitQQVNTIFJpZ2h0IGRh dGEgY2hhbm5lbCBpbml0OiBkZWZhdWx0IG9yZGVyZWQgaW5pdCB3aXRoIGlkIAorUEFTUyBSaWdo dCBkYXRhIGNoYW5uZWwgaW5pdDogbm8gaW5pdCAKK1BBU1MgUmlnaHQgZGF0YSBjaGFubmVsIGlu aXQ6IG51bGwgCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy9kYXRhY2hhbm5lbC9i YXNpYy5odG1sIGIvTGF5b3V0VGVzdHMvd2VicnRjL2RhdGFjaGFubmVsL2Jhc2ljLmh0bWwKaW5k ZXggYTg1NWEzYjA3MmFkYjQzMmU4MDRkNGIyYzE5OWU3MWU0NDgwNjdmOC4uN2RkOWUyOTU3N2Y3 N2E3M2RiYmExYjg3NmExZWZjZDAxZGMzYmU4OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2Vi cnRjL2RhdGFjaGFubmVsL2Jhc2ljLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRjL2RhdGFj aGFubmVsL2Jhc2ljLmh0bWwKQEAgLTExOCw2ICsxMTgsMTA4IEBAIHByb21pc2VfdGVzdCgodGVz dCkgPT4gewogICAgIH0pOwogfSwgIkJhc2ljIGRhdGEgY2hhbm5lbCBleGNoYW5nZSBmcm9tIG9m ZmVyZXIgdG8gcmVjZWl2ZXIgdXNpbmcgVENQIG9ubHkiKTsKIAorcHJvbWlzZV90ZXN0KCh0ZXN0 KSA9PiB7CisgICAgY291bnRlciA9IDA7CisgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZl LCByZWplY3QpID0+IHsKKyAgICAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgICAg ICBpbnRlcm5hbHMudXNlTW9ja1JUQ1BlZXJDb25uZWN0aW9uRmFjdG9yeSgiVHdvUmVhbFBlZXJD b25uZWN0aW9ucyIpOworCisgICAgICAgIHZhciBjaGVja0RhdGFDaGFubmVsT3B0aW9ucyA9IChj aGFubmVsLCBpbml0KSA9PiB7CisgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKGNoYW5uZWwub3Jk ZXJlZCwgaW5pdC5vcmRlcmVkLCAib3JkZXJlZCIpOworICAgICAgICAgICAgYXNzZXJ0X2VxdWFs cyhjaGFubmVsLm1heFBhY2tldExpZmVUaW1lLCBpbml0Lm1heFBhY2tldExpZmVUaW1lLCAibWF4 UGFja2V0TGlmZVRpbWUiKTsKKyAgICAgICAgICAgIGFzc2VydF9lcXVhbHMoY2hhbm5lbC5tYXhS ZXRyYW5zbWl0VGltZSwgaW5pdC5tYXhSZXRyYW5zbWl0VGltZSwgIm1heFJldHJhbnNtaXRUaW1l Iik7CisgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKGNoYW5uZWwubWF4UmV0cmFuc21pdHMsIGlu aXQubWF4UmV0cmFuc21pdHMsICJtYXhSZXRyYW5zbWl0cyIpOworICAgICAgICAgICAgYXNzZXJ0 X2VxdWFscyhjaGFubmVsLnByb3RvY29sLCBpbml0LnByb3RvY29sLCAicHJvdG9jb2wiKTsKKyAg ICAgICAgICAgIGFzc2VydF9lcXVhbHMoY2hhbm5lbC5uZWdvdGlhdGVkLCBpbml0Lm5lZ290aWF0 ZWQsICJuZWdvdGlhdGVkIik7CisgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKGNoYW5uZWwuaWQs IGluaXQuaWQsICJpZCIpOworICAgICAgICB9OworCisgICAgICAgIGZpbmlzaFRlc3QgPSByZXNv bHZlOworICAgICAgICBjcmVhdGVDb25uZWN0aW9ucygobG9jYWxDb25uZWN0aW9uKSA9PiB7Cisg ICAgICAgICAgICB2YXIgaW5pdCA9IHsgb3JkZXJlZDogdHJ1ZSwgbWF4UGFja2V0TGlmZVRpbWU6 IDEwLCBtYXhSZXRyYW5zbWl0VGltZTogMTEsIHByb3RvY29sOiAid2hhdGV2ZXIiLCBuZWdvdGlh dGVkOiBmYWxzZSwgaWQ6ICJpZCIgfTsKKyAgICAgICAgICAgIGxvY2FsQ2hhbm5lbCA9IGxvY2Fs Q29ubmVjdGlvbi5jcmVhdGVEYXRhQ2hhbm5lbCgnc2VuZERhdGFDaGFubmVsJywgaW5pdCk7Cisg ICAgICAgICAgICBsb2NhbENoYW5uZWwub25vcGVuID0gKCkgPT4geyBzZW5kTWVzc2FnZXMobG9j YWxDaGFubmVsKSB9OworICAgICAgICB9LCAocmVtb3RlQ29ubmVjdGlvbikgPT4geworICAgICAg ICAgICAgcmVtb3RlQ29ubmVjdGlvbi5vbmRhdGFjaGFubmVsID0gKGV2ZW50KSA9PiB7CisgICAg ICAgICAgICAgICAgcmVtb3RlQ2hhbm5lbCA9IGV2ZW50LmNoYW5uZWw7CisgICAgICAgICAgICAg ICAgcmVtb3RlQ2hhbm5lbC5vbm1lc3NhZ2UgPSByZWNlaXZlTWVzc2FnZXM7CisgICAgICAgICAg ICB9OworICAgICAgICB9KTsKKyAgICB9KTsKK30sICJCYXNpYyBkYXRhIGNoYW5uZWwgZXhjaGFu Z2UgZnJvbSBvZmZlcmVyIHRvIHJlY2VpdmVyIik7CisKK3ZhciBsb25nU3RyaW5nID0gImFiY2Rl ZmdoIjsKK2ZvciAodmFyIGNwdHIgPSAwOyBjcHRyIDwgMTY7ICsrY3B0cikKKyAgICBsb25nU3Ry aW5nICs9IGxvbmdTdHJpbmc7CisKK3Rlc3QoKCkgPT4geworICAgIGlmICh3aW5kb3cuaW50ZXJu YWxzKQorICAgICAgICBpbnRlcm5hbHMudXNlTW9ja1JUQ1BlZXJDb25uZWN0aW9uRmFjdG9yeSgi T25lUmVhbFBlZXJDb25uZWN0aW9ucyIpOworICAgIHZhciBwYyA9IG5ldyBSVENQZWVyQ29ubmVj dGlvbigpOworICAgIGFzc2VydF90aHJvd3MobmV3IFR5cGVFcnJvciwgKCkgPT4geyBwYy5jcmVh dGVEYXRhQ2hhbm5lbChsb25nU3RyaW5nKTsgfSk7Cit9LCAiQ3JlYXRpbmcgZGF0YSBjaGFubmVs IHdpdGggdmVyeSBsb25nIGxhYmVsIik7CisKK3Rlc3QoKCkgPT4geworICAgIGlmICh3aW5kb3cu aW50ZXJuYWxzKQorICAgICAgICBpbnRlcm5hbHMudXNlTW9ja1JUQ1BlZXJDb25uZWN0aW9uRmFj dG9yeSgiT25lUmVhbFBlZXJDb25uZWN0aW9ucyIpOworICAgIHZhciBwYyA9IG5ldyBSVENQZWVy Q29ubmVjdGlvbigpOworICAgIHBjLmNsb3NlKCk7CisgICAgYXNzZXJ0X3Rocm93cygiSW52YWxp ZFN0YXRlRXJyb3IiLCAoKSA9PiB7IHBjLmNyZWF0ZURhdGFDaGFubmVsKCdzZW5kRGF0YUNoYW5u ZWwnKTsgfSk7Cit9LCAiQ3JlYXRpbmcgZGF0YSBjaGFubmVsIGFmdGVyIGNsb3NpbmcgdGhlIGNv bm5lY3Rpb24iKTsKKworZnVuY3Rpb24gdGVzdFdyb25nRGF0YUNoYW5uZWxJbml0KGluaXQsIHRp dGxlKQoreworICAgIHJldHVybiB0ZXN0KCgpID0+IHsKKyAgICAgICAgaWYgKHdpbmRvdy5pbnRl cm5hbHMpCisgICAgICAgICAgICBpbnRlcm5hbHMudXNlTW9ja1JUQ1BlZXJDb25uZWN0aW9uRmFj dG9yeSgiT25lUmVhbFBlZXJDb25uZWN0aW9ucyIpOworICAgICAgICB2YXIgcGMgPSBuZXcgUlRD UGVlckNvbm5lY3Rpb24oKTsKKyAgICAgICAgYXNzZXJ0X3Rocm93cyhuZXcgVHlwZUVycm9yLCAo KSA9PiB7IHBjLmNyZWF0ZURhdGFDaGFubmVsKCdzZW5kRGF0YUNoYW5uZWwnLCBpbml0KTsgfSk7 CisgICAgfSwgIldyb25nIGRhdGEgY2hhbm5lbCBpbml0OiAiICsgdGl0bGUpOworfQorCitmdW5j dGlvbiB0ZXN0UmlnaHREYXRhQ2hhbm5lbEluaXQoaW5pdCwgdGl0bGUpCit7CisgICAgcmV0dXJu IHRlc3QoKCkgPT4geworICAgICAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgICAg IGludGVybmFscy51c2VNb2NrUlRDUGVlckNvbm5lY3Rpb25GYWN0b3J5KCJPbmVSZWFsUGVlckNv bm5lY3Rpb25zIik7CisgICAgICAgIHZhciBwYyA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOwor ICAgICAgICBjaGFubmVsID0gcGMuY3JlYXRlRGF0YUNoYW5uZWwoJ3NlbmREYXRhQ2hhbm5lbCcs IGluaXQpOworCisgICAgICAgIGlmICghaW5pdCkKKyAgICAgICAgICAgIGluaXQgPSB7IH07Cisg ICAgICAgIGlmIChpbml0Lm9yZGVyZWQgPT09IHVuZGVmaW5lZCkKKyAgICAgICAgICAgIGluaXQu b3JkZXJlZCA9IHRydWU7CisgICAgICAgIGlmIChpbml0Lm1heFBhY2tldExpZmVUaW1lID09PSB1 bmRlZmluZWQpCisgICAgICAgICAgICBpbml0Lm1heFBhY2tldExpZmVUaW1lID0gbnVsbDsKKyAg ICAgICAgaWYgKGluaXQubWF4UmV0cmFuc21pdHMgPT09IHVuZGVmaW5lZCkKKyAgICAgICAgICAg IGluaXQubWF4UmV0cmFuc21pdHMgPSBudWxsOworICAgICAgICBpZiAoaW5pdC5wcm90b2NvbCA9 PT0gdW5kZWZpbmVkKQorICAgICAgICAgICAgaW5pdC5wcm90b2NvbCA9ICIiOworICAgICAgICBp ZiAoaW5pdC5uZWdvdGlhdGVkID09PSB1bmRlZmluZWQpCisgICAgICAgICAgICBpbml0Lm5lZ290 aWF0ZWQgPSBmYWxzZTsKKyAgICAgICAgaWYgKGluaXQuaWQgPT09IHVuZGVmaW5lZCkKKyAgICAg ICAgICAgIGluaXQuaWQgPSBudWxsOworCisKKyAgICAgICAgYXNzZXJ0X2VxdWFscyhjaGFubmVs Lm9yZGVyZWQsIGluaXQub3JkZXJlZCwgIm9yZGVyZWQiKTsKKyAgICAgICAgYXNzZXJ0X2VxdWFs cyhjaGFubmVsLm1heFBhY2tldExpZmVUaW1lLCBpbml0Lm1heFBhY2tldExpZmVUaW1lLCAibWF4 UGFja2V0TGlmZVRpbWUiKTsKKyAgICAgICAgYXNzZXJ0X2VxdWFscyhjaGFubmVsLm1heFJldHJh bnNtaXRUaW1lLCBpbml0Lm1heFJldHJhbnNtaXRUaW1lLCAibWF4UmV0cmFuc21pdFRpbWUiKTsK KyAgICAgICAgYXNzZXJ0X2VxdWFscyhjaGFubmVsLm1heFJldHJhbnNtaXRzLCBpbml0Lm1heFJl dHJhbnNtaXRzLCAibWF4UmV0cmFuc21pdHMiKTsKKyAgICAgICAgYXNzZXJ0X2VxdWFscyhjaGFu bmVsLnByb3RvY29sLCBpbml0LnByb3RvY29sLCAicHJvdG9jb2wiKTsKKyAgICAgICAgYXNzZXJ0 X2VxdWFscyhjaGFubmVsLm5lZ290aWF0ZWQsIGluaXQubmVnb3RpYXRlZCwgIm5lZ290aWF0ZWQi KTsKKyAgICAgICAgYXNzZXJ0X2VxdWFscyhjaGFubmVsLmlkLCBpbml0LmlkLCAiaWQiKTsKKyAg ICAgfSwgIlJpZ2h0IGRhdGEgY2hhbm5lbCBpbml0OiAiICsgdGl0bGUpOworfQorCit0ZXN0V3Jv bmdEYXRhQ2hhbm5lbEluaXQoe25lZ290aWF0ZWQ6IGZhbHNlLCBwcm90b2NvbDogbG9uZ1N0cmlu Z30sICJsb25nIHByb3RvY29sIik7Cit0ZXN0V3JvbmdEYXRhQ2hhbm5lbEluaXQoe2lkOiA2NTUz NX0sICJsb25nIGlkIik7Cit0ZXN0V3JvbmdEYXRhQ2hhbm5lbEluaXQoe21heFBhY2tldExpZmVU aW1lOiAxLCBtYXhSZXRyYW5zbWl0czogMX0sICJtYXhQYWNrZXRMaWZlVGltZSBhbmQgbWF4UmV0 cmFuc21pdHMiKTsKKwordGVzdFJpZ2h0RGF0YUNoYW5uZWxJbml0KHtvcmRlcmVkOiB0cnVlLCBt YXhSZXRyYW5zbWl0OiAxMSwgcHJvdG9jb2w6ICJ3aGF0ZXZlciIsIG5lZ290aWF0ZWQ6IGZhbHNl LCBpZDogMSB9LCAib3JkZXJlZCBpbml0Iik7Cit0ZXN0UmlnaHREYXRhQ2hhbm5lbEluaXQoe29y ZGVyZWQ6IGZhbHNlLCBtYXhQYWNrZXRMaWZlVGltZTogMTAsIHByb3RvY29sOiAid2hhdGV2ZXIi LCBuZWdvdGlhdGVkOiBmYWxzZSwgaWQ6IDIgfSwgInVub3JkZXJlZCBpbml0Iik7Cit0ZXN0Umln aHREYXRhQ2hhbm5lbEluaXQoe3Byb3RvY29sOiAid2hhdGV2ZXIiLCBuZWdvdGlhdGVkOiBmYWxz ZSwgaWQ6IDEyMyB9LCAiZGVmYXVsdCBvcmRlcmVkIGluaXQgd2l0aCBpZCIpOwordGVzdFJpZ2h0 RGF0YUNoYW5uZWxJbml0KHVuZGVmaW5lZCwgIm5vIGluaXQiKTsKK3Rlc3RSaWdodERhdGFDaGFu bmVsSW5pdChudWxsLCAibnVsbCIpOwogICAgIDwvc2NyaXB0PgogICA8L2JvZHk+CiA8L2h0bWw+ Cg== 305481 2017-03-27 10:30:16 -0700 2017-03-27 11:13:23 -0700 Patch for landing bug-170081-20170327103015.patch text/plain 15590 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjRhNzAwYmEzOThjNmRm MzVhMjQ5ZTkyNTUxZWMxNjI1Y2Q0YzQ0NS4uOTc4MDcwYzE4MTkzOGYwYjdlM2UwYTk0OGUyNTY1 ZTg4YjkxNWIxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTAzLTI3ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBUaWdodGVuIFJUQ0RhdGFj aGFubmVsIGNyZWF0aW9uIGFuZCBwYXJhbWV0ZXIgZ2V0dGVycworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMDgxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIENvdmVyZWQgYnkgdXBkYXRlZCB0ZXN0cy4KKwor ICAgICAgICBBZGRpbmcgc29tZSBwYXJhbWV0ZXIgY2hlY2tzIHdoZW4gY3JlYXRpbmcgZGF0YSBj aGFubmVscy4KKyAgICAgICAgTWFraW5nIHNvbWUgZ2V0dGVycyBudWxsYWJsZSBhcyBwZXIgdGhl IHNwZWMuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsLmg6 CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbC5pZGw6CisgICAg ICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbjo6Y3JlYXRlRGF0YUNoYW5uZWwpOgorICAgICAg ICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uaWRsOgorICAgICAgICAq IE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6Y3JlYXRlRGF0YUNo YW5uZWwpOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6YWRkRGF0 YUNoYW5uZWwpOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVs SGFuZGxlci5oOgorICAgICAgICAoKTogRGVsZXRlZC4KKwogMjAxNy0wMy0yNyAgTXlsZXMgQy4g TWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2Ugc3VyZSBhbmlt YXRpb24gd29ya3MgZm9yIGZvbnQtd2VpZ2h0LCBmb250LXN0cmV0Y2gsIGFuZCBmb250LXN0eWxl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFD aGFubmVsLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFu bmVsLmgKaW5kZXggY2Q4NjBmMTg0ZDJlZTM1NWYwODc2OGY5MmJiNGUwOTBmNzQ4NDAzMi4uYzk0 ZjZiOTM4ZTVhNzg4NjFlMzRiMzUzZDliZWIxNjBmZTA4YjgxZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWwuaApAQCAtNDgsMTIg KzQ4LDEyIEBAIGNsYXNzIFJUQ0RhdGFDaGFubmVsIGZpbmFsIDogcHVibGljIFJUQ0RhdGFDaGFu bmVsSGFuZGxlckNsaWVudCwgcHVibGljIEV2ZW50VGFyCiBwdWJsaWM6CiAgICAgc3RhdGljIFJl ZjxSVENEYXRhQ2hhbm5lbD4gY3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBzdGQ6OnVu aXF1ZV9wdHI8UlRDRGF0YUNoYW5uZWxIYW5kbGVyPiYmLCBTdHJpbmcmJiwgUlRDRGF0YUNoYW5u ZWxJbml0JiYpOwogCi0gICAgYm9vbCBvcmRlcmVkKCkgY29uc3QgeyByZXR1cm4gbV9vcHRpb25z Lm9yZGVyZWQ7IH0KLSAgICB1bnNpZ25lZCBzaG9ydCBtYXhSZXRyYW5zbWl0VGltZSgpIGNvbnN0 IHsgcmV0dXJuIG1fb3B0aW9ucy5tYXhSZXRyYW5zbWl0VGltZTsgfQotICAgIHVuc2lnbmVkIHNo b3J0IG1heFJldHJhbnNtaXRzKCkgY29uc3QgeyByZXR1cm4gbV9vcHRpb25zLm1heFJldHJhbnNt aXRzOyB9CisgICAgYm9vbCBvcmRlcmVkKCkgY29uc3QgeyByZXR1cm4gKm1fb3B0aW9ucy5vcmRl cmVkOyB9CisgICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4gbWF4UGFja2V0TGlmZVRp bWUoKSBjb25zdCB7IHJldHVybiBtX29wdGlvbnMubWF4UGFja2V0TGlmZVRpbWU7IH0KKyAgICBz dGQ6Om9wdGlvbmFsPHVuc2lnbmVkIHNob3J0PiBtYXhSZXRyYW5zbWl0cygpIGNvbnN0IHsgcmV0 dXJuIG1fb3B0aW9ucy5tYXhSZXRyYW5zbWl0czsgfQogICAgIFN0cmluZyBwcm90b2NvbCgpIGNv bnN0IHsgcmV0dXJuIG1fb3B0aW9ucy5wcm90b2NvbDsgfQotICAgIGJvb2wgbmVnb3RpYXRlZCgp IGNvbnN0IHsgcmV0dXJuIG1fb3B0aW9ucy5uZWdvdGlhdGVkOyB9OwotICAgIHVuc2lnbmVkIHNo b3J0IGlkKCkgY29uc3QgeyByZXR1cm4gbV9vcHRpb25zLmlkOyB9OworICAgIGJvb2wgbmVnb3Rp YXRlZCgpIGNvbnN0IHsgcmV0dXJuICptX29wdGlvbnMubmVnb3RpYXRlZDsgfTsKKyAgICBzdGQ6 Om9wdGlvbmFsPHVuc2lnbmVkIHNob3J0PiBpZCgpIGNvbnN0IHsgcmV0dXJuIG1fb3B0aW9ucy5p ZDsgfTsKIAogICAgIFN0cmluZyBsYWJlbCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFiZWw7IH0KICAg ICBjb25zdCBBdG9taWNTdHJpbmcmIHJlYWR5U3RhdGUoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWwuaWRsIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbC5pZGwKaW5kZXgg ZTc3OGMwZjk2ZDMzZDE1MWEyNjgxODY1OGMwZjZiMzAyZDBjOTA5NC4uNzgzMjFlYTk5NTIwOTlk NTIzZDMwNGE4YjQ2Y2ZmNWJmYWI2MmM3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbC5pZGwKQEAgLTI4LDExICsyOCwxMSBA QAogXSBpbnRlcmZhY2UgUlRDRGF0YUNoYW5uZWwgOiBFdmVudFRhcmdldCB7CiAgICAgcmVhZG9u bHkgYXR0cmlidXRlIERPTVN0cmluZyBsYWJlbDsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgYm9v bGVhbiBvcmRlcmVkOwotICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBzaG9ydCBtYXhS ZXRyYW5zbWl0VGltZTsKLSAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgc2hvcnQgbWF4 UmV0cmFuc21pdHM7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIHNob3J0PyBtYXhQ YWNrZXRMaWZlVGltZTsKKyAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgc2hvcnQ/IG1h eFJldHJhbnNtaXRzOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgcHJvdG9jb2w7 CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGJvb2xlYW4gbmVnb3RpYXRlZDsKLSAgICByZWFkb25s eSBhdHRyaWJ1dGUgdW5zaWduZWQgc2hvcnQgaWQ7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIHVu c2lnbmVkIHNob3J0PyBpZDsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIHJlYWR5 U3RhdGU7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgYnVmZmVyZWRBbW91 bnQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRD UGVlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9S VENQZWVyQ29ubmVjdGlvbi5jcHAKaW5kZXggMzg2MGRhYWIxNzQ0NTI4MmExOTRkMjNjNmFiM2Yy YWZmM2M2NzgzYS4uYjhkZjM1NzhmZTcwODUzMjMxMmI1YWIwZTRlNmUxYjFhZDU5MzRmMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVj dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVy Q29ubmVjdGlvbi5jcHAKQEAgLTMzMiw3ICszMzIsMTUgQEAgRXhjZXB0aW9uT3I8UmVmPFJUQ0Rh dGFDaGFubmVsPj4gUlRDUGVlckNvbm5lY3Rpb246OmNyZWF0ZURhdGFDaGFubmVsKFNjcmlwdEV4 ZWMKICAgICBpZiAobV9zaWduYWxpbmdTdGF0ZSA9PSBSVENTaWduYWxpbmdTdGF0ZTo6Q2xvc2Vk KQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgSU5WQUxJRF9TVEFURV9FUlIgfTsKIAotICAg IC8vIEZJWE1FOiBDaGVjayBvcHRpb25zCisgICAgaWYgKG9wdGlvbnMubmVnb3RpYXRlZCAmJiAh b3B0aW9ucy5uZWdvdGlhdGVkLnZhbHVlKCkgJiYgKGxhYmVsLmxlbmd0aCgpID4gNjU1MzUgfHwg b3B0aW9ucy5wcm90b2NvbC5sZW5ndGgoKSA+IDY1NTM1KSkKKyAgICAgICAgcmV0dXJuIEV4Y2Vw dGlvbiB7IFR5cGVFcnJvciB9OworCisgICAgaWYgKG9wdGlvbnMubWF4UGFja2V0TGlmZVRpbWUg JiYgb3B0aW9ucy5tYXhSZXRyYW5zbWl0cykKKyAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFR5 cGVFcnJvciB9OworCisgICAgaWYgKG9wdGlvbnMuaWQgJiYgb3B0aW9ucy5pZC52YWx1ZSgpID4g NjU1MzQpCisgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBUeXBlRXJyb3IgfTsKKyAgICAKICAg ICBhdXRvIGNoYW5uZWxIYW5kbGVyID0gbV9iYWNrZW5kLT5jcmVhdGVEYXRhQ2hhbm5lbEhhbmRs ZXIobGFiZWwsIG9wdGlvbnMpOwogICAgIGlmICghY2hhbm5lbEhhbmRsZXIpCiAgICAgICAgIHJl dHVybiBFeGNlcHRpb24geyBOT1RfU1VQUE9SVEVEX0VSUiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5pZGwgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmlkbAppbmRl eCBmOTU3MDkzOTMzY2ZkNGUxMmVjMzY2Yzg2YWIzNjcyMzdjNTAyNmM1Li43ODUxNzkyODUxMDI5 MDhjN2M1YjJkYjVmYzI0ZjZiMTJkZjkxNTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmlkbAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmlkbApAQCAtMzgsOCAr MzgsNyBAQCB0eXBlZGVmIFJUQ1J0cFRyYW5zY2VpdmVyRGlyZWN0aW9uIFJ0cFRyYW5zY2VpdmVy RGlyZWN0aW9uOwogICAgIEVuYWJsZWRBdFJ1bnRpbWU9UGVlckNvbm5lY3Rpb24KIF0gZGljdGlv bmFyeSBSVENEYXRhQ2hhbm5lbEluaXQgewogICAgIGJvb2xlYW4gb3JkZXJlZCA9IHRydWU7Ci0g ICAgLy8gRklYTUUgMTY5NjQ0OiByZW5hbWUgdG8gbWF4UGFja2V0TGlmZVRpbWU7Ci0gICAgdW5z aWduZWQgc2hvcnQgbWF4UmV0cmFuc21pdFRpbWU7CisgICAgdW5zaWduZWQgc2hvcnQgbWF4UGFj a2V0TGlmZVRpbWU7CiAgICAgdW5zaWduZWQgc2hvcnQgbWF4UmV0cmFuc21pdHM7CiAgICAgVVNW U3RyaW5nIHByb3RvY29sID0gIiI7CiAgICAgYm9vbGVhbiBuZWdvdGlhdGVkID0gZmFsc2U7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9M aWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCmluZGV4IDE5M2FkM2M5 YjYzYmFmYjdjZjZmM2ExMjAyZTgxOTMwNDYwMDFmMzMuLjEzMmIwNWYxZmM0MzRkMzA4ZDQ3Yzg0 NmY3MmI0OGI0MzRlZTBkYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5k cG9pbnQuY3BwCkBAIC01NDgsMTIgKzU0OCwxNyBAQCB2b2lkIExpYldlYlJUQ01lZGlhRW5kcG9p bnQ6Ok9uQWRkVHJhY2socnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6UnRwUmVjZWl2ZXJJbgog c3RkOjp1bmlxdWVfcHRyPFJUQ0RhdGFDaGFubmVsSGFuZGxlcj4gTGliV2ViUlRDTWVkaWFFbmRw b2ludDo6Y3JlYXRlRGF0YUNoYW5uZWwoY29uc3QgU3RyaW5nJiBsYWJlbCwgY29uc3QgUlRDRGF0 YUNoYW5uZWxJbml0JiBvcHRpb25zKQogewogICAgIHdlYnJ0Yzo6RGF0YUNoYW5uZWxJbml0IGlu aXQ7Ci0gICAgaW5pdC5vcmRlcmVkID0gb3B0aW9ucy5vcmRlcmVkOwotICAgIGluaXQubWF4UmV0 cmFuc21pdFRpbWUgPSBvcHRpb25zLm1heFJldHJhbnNtaXRUaW1lOwotICAgIGluaXQubWF4UmV0 cmFuc21pdHMgPSBvcHRpb25zLm1heFJldHJhbnNtaXRzOworICAgIGlmIChvcHRpb25zLm9yZGVy ZWQpCisgICAgICAgIGluaXQub3JkZXJlZCA9ICpvcHRpb25zLm9yZGVyZWQ7CisgICAgaWYgKG9w dGlvbnMubWF4UGFja2V0TGlmZVRpbWUpCisgICAgICAgIGluaXQubWF4UmV0cmFuc21pdFRpbWUg PSAqb3B0aW9ucy5tYXhQYWNrZXRMaWZlVGltZTsKKyAgICBpZiAob3B0aW9ucy5tYXhSZXRyYW5z bWl0cykKKyAgICAgICAgaW5pdC5tYXhSZXRyYW5zbWl0cyA9ICpvcHRpb25zLm1heFJldHJhbnNt aXRzOwogICAgIGluaXQucHJvdG9jb2wgPSBvcHRpb25zLnByb3RvY29sLnV0ZjgoKS5kYXRhKCk7 Ci0gICAgaW5pdC5uZWdvdGlhdGVkID0gb3B0aW9ucy5uZWdvdGlhdGVkOwotICAgIGluaXQuaWQg PSBvcHRpb25zLmlkOworICAgIGlmIChvcHRpb25zLm5lZ290aWF0ZWQpCisgICAgICAgIGluaXQu bmVnb3RpYXRlZCA9ICpvcHRpb25zLm5lZ290aWF0ZWQ7CisgICAgaWYgKG9wdGlvbnMuaWQpCisg ICAgICAgIGluaXQuaWQgPSAqb3B0aW9ucy5pZDsKIAogICAgIHJldHVybiBzdGQ6Om1ha2VfdW5p cXVlPExpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlcj4obV9iYWNrZW5kLT5DcmVhdGVEYXRhQ2hh bm5lbChsYWJlbC51dGY4KCkuZGF0YSgpLCAmaW5pdCkpOwogfQpAQCAtNTY1LDcgKzU3MCw3IEBA IHZvaWQgTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6YWRkRGF0YUNoYW5uZWwocnRjOjpzY29wZWRf cmVmcHRyPHdlYnJ0Yzo6RGF0YUNoYW5uCiAKICAgICBSVENEYXRhQ2hhbm5lbEluaXQgaW5pdDsK ICAgICBpbml0Lm9yZGVyZWQgPSBkYXRhQ2hhbm5lbC0+b3JkZXJlZCgpOwotICAgIGluaXQubWF4 UmV0cmFuc21pdFRpbWUgPSBkYXRhQ2hhbm5lbC0+bWF4UmV0cmFuc21pdFRpbWUoKTsKKyAgICBp bml0Lm1heFBhY2tldExpZmVUaW1lID0gZGF0YUNoYW5uZWwtPm1heFJldHJhbnNtaXRUaW1lKCk7 CiAgICAgaW5pdC5tYXhSZXRyYW5zbWl0cyA9IGRhdGFDaGFubmVsLT5tYXhSZXRyYW5zbWl0cygp OwogICAgIGluaXQucHJvdG9jb2wgPSBTdHJpbmcocHJvdG9jb2wuZGF0YSgpLCBwcm90b2NvbC5z aXplKCkpOwogICAgIGluaXQubmVnb3RpYXRlZCA9IGRhdGFDaGFubmVsLT5uZWdvdGlhdGVkKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SVENEYXRh Q2hhbm5lbEhhbmRsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JU Q0RhdGFDaGFubmVsSGFuZGxlci5oCmluZGV4IGU0NjU1ZGQzMGQzMzE4NjJkZDhhZGM5NzhkOTVk NTdjZGEyMDk4YTEuLmZkMzU3NzgwMzZhMTk2MDdkYzE4MzliNGI4ZjkzZGE5ZjMwM2VlNjIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFu bmVsSGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JU Q0RhdGFDaGFubmVsSGFuZGxlci5oCkBAIC0yNiwxNyArMjYsMTggQEAKIAogI2lmIEVOQUJMRShX RUJfUlRDKQogCisjaW5jbHVkZSA8d3RmL09wdGlvbmFsLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv V1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IFJUQ0RhdGFDaGFu bmVsSW5pdCB7Ci0gICAgYm9vbCBvcmRlcmVkIHsgdHJ1ZSB9OwotICAgIGludCBtYXhSZXRyYW5z bWl0VGltZSB7IC0xIH07Ci0gICAgaW50IG1heFJldHJhbnNtaXRzIHsgLTEgfTsKKyAgICBzdGQ6 Om9wdGlvbmFsPGJvb2w+IG9yZGVyZWQ7CisgICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9y dD4gbWF4UGFja2V0TGlmZVRpbWU7CisgICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4g bWF4UmV0cmFuc21pdHM7CiAgICAgU3RyaW5nIHByb3RvY29sOwotICAgIGJvb2wgbmVnb3RpYXRl ZCB7IGZhbHNlIH07Ci0gICAgaW50IGlkIHsgLTEgfTsKKyAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+ IG5lZ290aWF0ZWQ7CisgICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZCBzaG9ydD4gaWQ7CiB9Owog CiBjbGFzcyBSVENEYXRhQ2hhbm5lbEhhbmRsZXJDbGllbnQ7CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzE5ZmRjNjhkOTk5 MTZmMzhlYmU5NGViNThjZjcxZDE5NTQ1OGM4My4uZTllMWVhMWRiMzZmYzIwMTdlZDBhM2ZjNTVl ZGQ0YjY0MzgzMjY1OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE3LTAzLTI3ICBZb3Vlbm4g RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBUaWdodGVuIFJUQ0RhdGFjaGFu bmVsIGNyZWF0aW9uIGFuZCBwYXJhbWV0ZXIgZ2V0dGVycworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMDgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RXJpYyBDYXJsc29uLgorCisgICAgICAgICogd2VicnRjL2RhdGFjaGFubmVsL2Jhc2ljLWV4cGVj dGVkLnR4dDoKKyAgICAgICAgKiB3ZWJydGMvZGF0YWNoYW5uZWwvYmFzaWMuaHRtbDoKKwogMjAx Ny0wMy0yNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAg ICAgIE1ha2Ugc3VyZSBhbmltYXRpb24gd29ya3MgZm9yIGZvbnQtd2VpZ2h0LCBmb250LXN0cmV0 Y2gsIGFuZCBmb250LXN0eWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvZGF0YWNo YW5uZWwvYmFzaWMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvd2VicnRjL2RhdGFjaGFubmVs L2Jhc2ljLWV4cGVjdGVkLnR4dAppbmRleCAxNDIyZGQwMmI0YTZkZWU3OGE0MzIxODUyODY1NTE3 NjE1N2NjNmI0Li5lZDVhNGNkNDM3OTI3Y2M1YjA1ZmFlMjZlYmRmZTNmYTU3YTYwYmMzIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJydGMvZGF0YWNoYW5uZWwvYmFzaWMtZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy9kYXRhY2hhbm5lbC9iYXNpYy1leHBlY3RlZC50eHQK QEAgLTMsNCArMywxNSBAQCBQQVNTIEJhc2ljIGRhdGEgY2hhbm5lbCBleGNoYW5nZSBmcm9tIG9m ZmVyZXIgdG8gcmVjZWl2ZXIKIFBBU1MgQmFzaWMgZGF0YSBjaGFubmVsIGV4Y2hhbmdlIGZyb20g cmVjZWl2ZXIgdG8gb2ZmZXJlciAKIFBBU1MgQmFzaWMgZGF0YSBjaGFubmVsIGV4Y2hhbmdlIGZy b20gb2ZmZXJlciB0byByZWNlaXZlciB1c2luZyBVRFAgb25seSAKIFBBU1MgQmFzaWMgZGF0YSBj aGFubmVsIGV4Y2hhbmdlIGZyb20gb2ZmZXJlciB0byByZWNlaXZlciB1c2luZyBUQ1Agb25seSAK K1BBU1MgQmFzaWMgZGF0YSBjaGFubmVsIGV4Y2hhbmdlIGZyb20gb2ZmZXJlciB0byByZWNlaXZl ciAKK1BBU1MgQ3JlYXRpbmcgZGF0YSBjaGFubmVsIHdpdGggdmVyeSBsb25nIGxhYmVsIAorUEFT UyBDcmVhdGluZyBkYXRhIGNoYW5uZWwgYWZ0ZXIgY2xvc2luZyB0aGUgY29ubmVjdGlvbiAKK1BB U1MgV3JvbmcgZGF0YSBjaGFubmVsIGluaXQ6IGxvbmcgcHJvdG9jb2wgCitQQVNTIFdyb25nIGRh dGEgY2hhbm5lbCBpbml0OiBsb25nIGlkIAorUEFTUyBXcm9uZyBkYXRhIGNoYW5uZWwgaW5pdDog bWF4UGFja2V0TGlmZVRpbWUgYW5kIG1heFJldHJhbnNtaXRzIAorUEFTUyBSaWdodCBkYXRhIGNo YW5uZWwgaW5pdDogb3JkZXJlZCBpbml0IAorUEFTUyBSaWdodCBkYXRhIGNoYW5uZWwgaW5pdDog dW5vcmRlcmVkIGluaXQgCitQQVNTIFJpZ2h0IGRhdGEgY2hhbm5lbCBpbml0OiBkZWZhdWx0IG9y ZGVyZWQgaW5pdCB3aXRoIGlkIAorUEFTUyBSaWdodCBkYXRhIGNoYW5uZWwgaW5pdDogbm8gaW5p dCAKK1BBU1MgUmlnaHQgZGF0YSBjaGFubmVsIGluaXQ6IG51bGwgCiAKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3dlYnJ0Yy9kYXRhY2hhbm5lbC9iYXNpYy5odG1sIGIvTGF5b3V0VGVzdHMvd2Vi cnRjL2RhdGFjaGFubmVsL2Jhc2ljLmh0bWwKaW5kZXggYTg1NWEzYjA3MmFkYjQzMmU4MDRkNGIy YzE5OWU3MWU0NDgwNjdmOC4uNDFlYTk2Y2FjMTUzMTRkMzlkNWQ1NDIzNDUwZDJhZWQ4YjQ4ZWRj MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2VicnRjL2RhdGFjaGFubmVsL2Jhc2ljLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvd2VicnRjL2RhdGFjaGFubmVsL2Jhc2ljLmh0bWwKQEAgLTExOCw2 ICsxMTgsMTA3IEBAIHByb21pc2VfdGVzdCgodGVzdCkgPT4gewogICAgIH0pOwogfSwgIkJhc2lj IGRhdGEgY2hhbm5lbCBleGNoYW5nZSBmcm9tIG9mZmVyZXIgdG8gcmVjZWl2ZXIgdXNpbmcgVENQ IG9ubHkiKTsKIAorcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7CisgICAgY291bnRlciA9IDA7Cisg ICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgaWYg KHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgICAgICBpbnRlcm5hbHMudXNlTW9ja1JUQ1BlZXJD b25uZWN0aW9uRmFjdG9yeSgiVHdvUmVhbFBlZXJDb25uZWN0aW9ucyIpOworCisgICAgICAgIHZh ciBjaGVja0RhdGFDaGFubmVsT3B0aW9ucyA9IChjaGFubmVsLCBpbml0KSA9PiB7CisgICAgICAg ICAgICBhc3NlcnRfZXF1YWxzKGNoYW5uZWwub3JkZXJlZCwgaW5pdC5vcmRlcmVkLCAib3JkZXJl ZCIpOworICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhjaGFubmVsLm1heFBhY2tldExpZmVUaW1l LCBpbml0Lm1heFBhY2tldExpZmVUaW1lLCAibWF4UGFja2V0TGlmZVRpbWUiKTsKKyAgICAgICAg ICAgIGFzc2VydF9lcXVhbHMoY2hhbm5lbC5tYXhSZXRyYW5zbWl0VGltZSwgaW5pdC5tYXhSZXRy YW5zbWl0VGltZSwgIm1heFJldHJhbnNtaXRUaW1lIik7CisgICAgICAgICAgICBhc3NlcnRfZXF1 YWxzKGNoYW5uZWwubWF4UmV0cmFuc21pdHMsIGluaXQubWF4UmV0cmFuc21pdHMsICJtYXhSZXRy YW5zbWl0cyIpOworICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhjaGFubmVsLnByb3RvY29sLCBp bml0LnByb3RvY29sLCAicHJvdG9jb2wiKTsKKyAgICAgICAgICAgIGFzc2VydF9lcXVhbHMoY2hh bm5lbC5uZWdvdGlhdGVkLCBpbml0Lm5lZ290aWF0ZWQsICJuZWdvdGlhdGVkIik7CisgICAgICAg ICAgICBhc3NlcnRfZXF1YWxzKGNoYW5uZWwuaWQsIGluaXQuaWQsICJpZCIpOworICAgICAgICB9 OworCisgICAgICAgIGZpbmlzaFRlc3QgPSByZXNvbHZlOworICAgICAgICBjcmVhdGVDb25uZWN0 aW9ucygobG9jYWxDb25uZWN0aW9uKSA9PiB7CisgICAgICAgICAgICB2YXIgaW5pdCA9IHsgb3Jk ZXJlZDogdHJ1ZSwgbWF4UGFja2V0TGlmZVRpbWU6IDEwLCBtYXhSZXRyYW5zbWl0VGltZTogMTEs IHByb3RvY29sOiAid2hhdGV2ZXIiLCBuZWdvdGlhdGVkOiBmYWxzZSwgaWQ6ICJpZCIgfTsKKyAg ICAgICAgICAgIGxvY2FsQ2hhbm5lbCA9IGxvY2FsQ29ubmVjdGlvbi5jcmVhdGVEYXRhQ2hhbm5l bCgnc2VuZERhdGFDaGFubmVsJywgaW5pdCk7CisgICAgICAgICAgICBsb2NhbENoYW5uZWwub25v cGVuID0gKCkgPT4geyBzZW5kTWVzc2FnZXMobG9jYWxDaGFubmVsKSB9OworICAgICAgICB9LCAo cmVtb3RlQ29ubmVjdGlvbikgPT4geworICAgICAgICAgICAgcmVtb3RlQ29ubmVjdGlvbi5vbmRh dGFjaGFubmVsID0gKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAgcmVtb3RlQ2hhbm5lbCA9 IGV2ZW50LmNoYW5uZWw7CisgICAgICAgICAgICAgICAgcmVtb3RlQ2hhbm5lbC5vbm1lc3NhZ2Ug PSByZWNlaXZlTWVzc2FnZXM7CisgICAgICAgICAgICB9OworICAgICAgICB9KTsKKyAgICB9KTsK K30sICJCYXNpYyBkYXRhIGNoYW5uZWwgZXhjaGFuZ2UgZnJvbSBvZmZlcmVyIHRvIHJlY2VpdmVy Iik7CisKK3ZhciBsb25nU3RyaW5nID0gImFiY2RlZmdoIjsKK2ZvciAodmFyIGNwdHIgPSAwOyBj cHRyIDwgMTY7ICsrY3B0cikKKyAgICBsb25nU3RyaW5nICs9IGxvbmdTdHJpbmc7CisKK3Rlc3Qo KCkgPT4geworICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICBpbnRlcm5hbHMudXNl TW9ja1JUQ1BlZXJDb25uZWN0aW9uRmFjdG9yeSgiT25lUmVhbFBlZXJDb25uZWN0aW9ucyIpOwor ICAgIHZhciBwYyA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOworICAgIGFzc2VydF90aHJvd3Mo bmV3IFR5cGVFcnJvciwgKCkgPT4geyBwYy5jcmVhdGVEYXRhQ2hhbm5lbChsb25nU3RyaW5nKTsg fSk7Cit9LCAiQ3JlYXRpbmcgZGF0YSBjaGFubmVsIHdpdGggdmVyeSBsb25nIGxhYmVsIik7CisK K3Rlc3QoKCkgPT4geworICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICBpbnRlcm5h bHMudXNlTW9ja1JUQ1BlZXJDb25uZWN0aW9uRmFjdG9yeSgiT25lUmVhbFBlZXJDb25uZWN0aW9u cyIpOworICAgIHZhciBwYyA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOworICAgIHBjLmNsb3Nl KCk7CisgICAgYXNzZXJ0X3Rocm93cygiSW52YWxpZFN0YXRlRXJyb3IiLCAoKSA9PiB7IHBjLmNy ZWF0ZURhdGFDaGFubmVsKCdzZW5kRGF0YUNoYW5uZWwnKTsgfSk7Cit9LCAiQ3JlYXRpbmcgZGF0 YSBjaGFubmVsIGFmdGVyIGNsb3NpbmcgdGhlIGNvbm5lY3Rpb24iKTsKKworZnVuY3Rpb24gdGVz dFdyb25nRGF0YUNoYW5uZWxJbml0KGluaXQsIHRpdGxlKQoreworICAgIHJldHVybiB0ZXN0KCgp ID0+IHsKKyAgICAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgICAgICBpbnRlcm5h bHMudXNlTW9ja1JUQ1BlZXJDb25uZWN0aW9uRmFjdG9yeSgiT25lUmVhbFBlZXJDb25uZWN0aW9u cyIpOworICAgICAgICB2YXIgcGMgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKyAgICAgICAg YXNzZXJ0X3Rocm93cyhuZXcgVHlwZUVycm9yLCAoKSA9PiB7IHBjLmNyZWF0ZURhdGFDaGFubmVs KCdzZW5kRGF0YUNoYW5uZWwnLCBpbml0KTsgfSk7CisgICAgfSwgIldyb25nIGRhdGEgY2hhbm5l bCBpbml0OiAiICsgdGl0bGUpOworfQorCitmdW5jdGlvbiB0ZXN0UmlnaHREYXRhQ2hhbm5lbElu aXQoaW5pdCwgdGl0bGUpCit7CisgICAgcmV0dXJuIHRlc3QoKCkgPT4geworICAgICAgICBpZiAo d2luZG93LmludGVybmFscykKKyAgICAgICAgICAgIGludGVybmFscy51c2VNb2NrUlRDUGVlckNv bm5lY3Rpb25GYWN0b3J5KCJPbmVSZWFsUGVlckNvbm5lY3Rpb25zIik7CisgICAgICAgIHZhciBw YyA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOworICAgICAgICBjaGFubmVsID0gcGMuY3JlYXRl RGF0YUNoYW5uZWwoJ3NlbmREYXRhQ2hhbm5lbCcsIGluaXQpOworCisgICAgICAgIGlmICghaW5p dCkKKyAgICAgICAgICAgIGluaXQgPSB7IH07CisgICAgICAgIGlmIChpbml0Lm9yZGVyZWQgPT09 IHVuZGVmaW5lZCkKKyAgICAgICAgICAgIGluaXQub3JkZXJlZCA9IHRydWU7CisgICAgICAgIGlm IChpbml0Lm1heFBhY2tldExpZmVUaW1lID09PSB1bmRlZmluZWQpCisgICAgICAgICAgICBpbml0 Lm1heFBhY2tldExpZmVUaW1lID0gbnVsbDsKKyAgICAgICAgaWYgKGluaXQubWF4UmV0cmFuc21p dHMgPT09IHVuZGVmaW5lZCkKKyAgICAgICAgICAgIGluaXQubWF4UmV0cmFuc21pdHMgPSBudWxs OworICAgICAgICBpZiAoaW5pdC5wcm90b2NvbCA9PT0gdW5kZWZpbmVkKQorICAgICAgICAgICAg aW5pdC5wcm90b2NvbCA9ICIiOworICAgICAgICBpZiAoaW5pdC5uZWdvdGlhdGVkID09PSB1bmRl ZmluZWQpCisgICAgICAgICAgICBpbml0Lm5lZ290aWF0ZWQgPSBmYWxzZTsKKyAgICAgICAgaWYg KGluaXQuaWQgPT09IHVuZGVmaW5lZCkKKyAgICAgICAgICAgIGluaXQuaWQgPSBudWxsOworCisg ICAgICAgIGFzc2VydF9lcXVhbHMoY2hhbm5lbC5vcmRlcmVkLCBpbml0Lm9yZGVyZWQsICJvcmRl cmVkIik7CisgICAgICAgIGFzc2VydF9lcXVhbHMoY2hhbm5lbC5tYXhQYWNrZXRMaWZlVGltZSwg aW5pdC5tYXhQYWNrZXRMaWZlVGltZSwgIm1heFBhY2tldExpZmVUaW1lIik7CisgICAgICAgIGFz c2VydF9lcXVhbHMoY2hhbm5lbC5tYXhSZXRyYW5zbWl0VGltZSwgaW5pdC5tYXhSZXRyYW5zbWl0 VGltZSwgIm1heFJldHJhbnNtaXRUaW1lIik7CisgICAgICAgIGFzc2VydF9lcXVhbHMoY2hhbm5l bC5tYXhSZXRyYW5zbWl0cywgaW5pdC5tYXhSZXRyYW5zbWl0cywgIm1heFJldHJhbnNtaXRzIik7 CisgICAgICAgIGFzc2VydF9lcXVhbHMoY2hhbm5lbC5wcm90b2NvbCwgaW5pdC5wcm90b2NvbCwg InByb3RvY29sIik7CisgICAgICAgIGFzc2VydF9lcXVhbHMoY2hhbm5lbC5uZWdvdGlhdGVkLCBp bml0Lm5lZ290aWF0ZWQsICJuZWdvdGlhdGVkIik7CisgICAgICAgIGFzc2VydF9lcXVhbHMoY2hh bm5lbC5pZCwgaW5pdC5pZCwgImlkIik7CisgICAgIH0sICJSaWdodCBkYXRhIGNoYW5uZWwgaW5p dDogIiArIHRpdGxlKTsKK30KKwordGVzdFdyb25nRGF0YUNoYW5uZWxJbml0KHtuZWdvdGlhdGVk OiBmYWxzZSwgcHJvdG9jb2w6IGxvbmdTdHJpbmd9LCAibG9uZyBwcm90b2NvbCIpOwordGVzdFdy b25nRGF0YUNoYW5uZWxJbml0KHtpZDogNjU1MzV9LCAibG9uZyBpZCIpOwordGVzdFdyb25nRGF0 YUNoYW5uZWxJbml0KHttYXhQYWNrZXRMaWZlVGltZTogMSwgbWF4UmV0cmFuc21pdHM6IDF9LCAi bWF4UGFja2V0TGlmZVRpbWUgYW5kIG1heFJldHJhbnNtaXRzIik7CisKK3Rlc3RSaWdodERhdGFD aGFubmVsSW5pdCh7b3JkZXJlZDogdHJ1ZSwgbWF4UmV0cmFuc21pdDogMTEsIHByb3RvY29sOiAi d2hhdGV2ZXIiLCBuZWdvdGlhdGVkOiBmYWxzZSwgaWQ6IDEgfSwgIm9yZGVyZWQgaW5pdCIpOwor dGVzdFJpZ2h0RGF0YUNoYW5uZWxJbml0KHtvcmRlcmVkOiBmYWxzZSwgbWF4UGFja2V0TGlmZVRp bWU6IDEwLCBwcm90b2NvbDogIndoYXRldmVyIiwgbmVnb3RpYXRlZDogZmFsc2UsIGlkOiAyIH0s ICJ1bm9yZGVyZWQgaW5pdCIpOwordGVzdFJpZ2h0RGF0YUNoYW5uZWxJbml0KHtwcm90b2NvbDog IndoYXRldmVyIiwgbmVnb3RpYXRlZDogZmFsc2UsIGlkOiAxMjMgfSwgImRlZmF1bHQgb3JkZXJl ZCBpbml0IHdpdGggaWQiKTsKK3Rlc3RSaWdodERhdGFDaGFubmVsSW5pdCh1bmRlZmluZWQsICJu byBpbml0Iik7Cit0ZXN0UmlnaHREYXRhQ2hhbm5lbEluaXQobnVsbCwgIm51bGwiKTsKICAgICA8 L3NjcmlwdD4KICAgPC9ib2R5PgogPC9odG1sPgo=