186813 2018-06-19 12:23:50 -0700 Use getCurrentProcessID over getpid 2018-06-19 15:03:25 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 don.olmstead don.olmstead achristensen annulen bfulgham cdumez commit-queue ews-watchlist mcatanzaro rniwa webkit-bug-importer oldest_to_newest 1434486 0 don.olmstead 2018-06-19 12:23:50 -0700 getpid is used in common code instead of getCurrentProcessID. 1434492 1 343079 don.olmstead 2018-06-19 12:33:34 -0700 Created attachment 343079 Patch 1434493 2 ews-watchlist 2018-06-19 12:35:49 -0700 Attachment 343079 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1434494 3 343080 don.olmstead 2018-06-19 12:37:22 -0700 Created attachment 343080 Patch 1434509 4 cdumez 2018-06-19 12:53:52 -0700 While I see the value in cross platform code, I am not convinced we should update platform-specific code. 1434521 5 don.olmstead 2018-06-19 13:23:57 -0700 (In reply to Chris Dumez from comment #4) > While I see the value in cross platform code, I am not convinced we should > update platform-specific code. I don't have a strong opinion on that. I'm fine with removing references in the platform specific bits. Seemed like if it was there in WTF we should just use it. 1434532 6 343092 don.olmstead 2018-06-19 13:47:25 -0700 Created attachment 343092 Patch Modified to just touch common code. 1434589 7 343092 commit-queue 2018-06-19 15:02:40 -0700 Comment on attachment 343092 Patch Clearing flags on attachment: 343092 Committed r232988: <https://trac.webkit.org/changeset/232988> 1434590 8 commit-queue 2018-06-19 15:02:42 -0700 All reviewed patches have been landed. Closing bug. 1434591 9 webkit-bug-importer 2018-06-19 15:03:25 -0700 <rdar://problem/41265747> 343079 2018-06-19 12:33:34 -0700 2018-06-19 12:37:22 -0700 Patch bug-186813.diff text/plain 6875 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ZTdhZDMwY2Q4Mi4uZDZiOTViM2I1OTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxOC0wNi0xOSAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnku Y29tPgorCisgICAgICAgIFVzZSBnZXRDdXJyZW50UHJvY2Vzc0lEIG92ZXIgZ2V0cGlkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY4MTMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMg KE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3gxMS9YRXJyb3JUcmFwcGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhFcnJvclRyYXBwZXI6OmVycm9yRXZlbnQpOgorCiAy MDE4LTA2LTE5ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2ZXJ0OiBBZGQgbG9nZ2luZyB3aGVuIHNwbGFzaGJvYXJkZCBlbmFibGVzIFdlYlRocmVhZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MveDExL1hFcnJvclRy YXBwZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MveDExL1hFcnJvclRy YXBwZXIuY3BwCmluZGV4IDZmZDRkNDlkZmUzLi4xNjM3NmQ5ZjgzZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MveDExL1hFcnJvclRyYXBwZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3gxMS9YRXJyb3JUcmFwcGVyLmNwcApA QCAtMjgsOSArMjgsOSBAQAogCiAjaWYgUExBVEZPUk0oWDExKQogI2luY2x1ZGUgPHN5cy90eXBl cy5oPgotI2luY2x1ZGUgPHVuaXN0ZC5oPgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5j bHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CisjaW5jbHVkZSA8d3RmL1Byb2Nlc3NJRC5oPgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTkwLDcgKzkwLDcgQEAgdm9pZCBYRXJyb3JUcmFw cGVyOjplcnJvckV2ZW50KFhFcnJvckV2ZW50KiBldmVudCkKICAgICAgICAgIiAgKERldGFpbHM6 IHNlcmlhbCAlbGQgZXJyb3JfY29kZSAlZCByZXF1ZXN0X2NvZGUgJWQgbWlub3JfY29kZSAlZClc biI7CiAgICAgY2hhciBlcnJvck1lc3NhZ2VbNjRdOwogICAgIFhHZXRFcnJvclRleHQobV9kaXNw bGF5LCBtX2Vycm9yQ29kZSwgZXJyb3JNZXNzYWdlLCA2Myk7Ci0gICAgV1RGTG9nQWx3YXlzKGVy cm9yRm9ybWF0U3RyaW5nLCBnZXRwaWQoKSwgZXJyb3JNZXNzYWdlLCBldmVudC0+c2VyaWFsLCBl dmVudC0+ZXJyb3JfY29kZSwgZXZlbnQtPnJlcXVlc3RfY29kZSwgZXZlbnQtPm1pbm9yX2NvZGUp OworICAgIFdURkxvZ0Fsd2F5cyhlcnJvckZvcm1hdFN0cmluZywgZ2V0Q3VycmVudFByb2Nlc3NJ RCgpLCBlcnJvck1lc3NhZ2UsIGV2ZW50LT5zZXJpYWwsIGV2ZW50LT5lcnJvcl9jb2RlLCBldmVu dC0+cmVxdWVzdF9jb2RlLCBldmVudC0+bWlub3JfY29kZSk7CiAKICAgICBpZiAobV9wb2xpY3kg PT0gUG9saWN5OjpDcmFzaCkKICAgICAgICAgQ1JBU0goKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMTNmM2FkN2Fj ODcuLjRmNDQ1MzE1MTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA2LTE5ICBE b24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CisKKyAgICAgICAgVXNlIGdldEN1 cnJlbnRQcm9jZXNzSUQgb3ZlciBnZXRwaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NjgxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogUGxhdGZvcm0vSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3Bw OgorICAgICAgICAoSVBDOjpDb25uZWN0aW9uOjpyZWFkeVJlYWRIYW5kbGVyKToKKyAgICAgICAg KiBTaGFyZWQvV2ViTWVtb3J5U2FtcGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1lbW9y eVNhbXBsZXI6OmluaXRpYWxpemVUaW1lcnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZW1vcnlT YW1wbGVyOjpzdG9wKToKKyAgICAgICAgKFdlYktpdDo6V2ViTWVtb3J5U2FtcGxlcjo6d3JpdGVI ZWFkZXJzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdl ckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJTV0NvbnRleHRNYW5hZ2VyQ29u bmVjdGlvbjo6aW5zdGFsbFNlcnZpY2VXb3JrZXIpOgorCiAyMDE4LTA2LTE5ICBXZW5zb24gSHNp ZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJLaXQgb24gd2F0Y2hP U10gVmVuZCB1c2VybmFtZSB0ZXh0IGNvbnRlbnQgdHlwZSB3aGVuIHVzaW5nIHNjcmliYmxlIGlu IGxvZ2luIGZpZWxkcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvdW5p eC9Db25uZWN0aW9uVW5peC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy91bml4L0Nv bm5lY3Rpb25Vbml4LmNwcAppbmRleCAzYzQ2Mzk0ZTJlMy4uOWRhOTY1YzEzZDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwCkBA IC0zMiwxMSArMzIsMTEgQEAKICNpbmNsdWRlICJTaGFyZWRNZW1vcnkuaCIKICNpbmNsdWRlICJV bml4TWVzc2FnZS5oIgogI2luY2x1ZGUgPHN5cy9zb2NrZXQuaD4KLSNpbmNsdWRlIDx1bmlzdGQu aD4KICNpbmNsdWRlIDxlcnJuby5oPgogI2luY2x1ZGUgPGZjbnRsLmg+CiAjaW5jbHVkZSA8cG9s bC5oPgogI2luY2x1ZGUgPHd0Zi9Bc3NlcnRpb25zLmg+CisjaW5jbHVkZSA8d3RmL1Byb2Nlc3NJ RC5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvVW5pU3Rk RXh0cmFzLmg+CiAKQEAgLTMwOCw3ICszMDgsNyBAQCB2b2lkIENvbm5lY3Rpb246OnJlYWR5UmVh ZEhhbmRsZXIoKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgaWYgKG1f aXNDb25uZWN0ZWQpIHsKLSAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIkVycm9yIHJlY2Vp dmluZyBJUEMgbWVzc2FnZSBvbiBzb2NrZXQgJWQgaW4gcHJvY2VzcyAlZDogJXMiLCBtX3NvY2tl dERlc2NyaXB0b3IsIGdldHBpZCgpLCBzdHJlcnJvcihlcnJubykpOworICAgICAgICAgICAgICAg IFdURkxvZ0Fsd2F5cygiRXJyb3IgcmVjZWl2aW5nIElQQyBtZXNzYWdlIG9uIHNvY2tldCAlZCBp biBwcm9jZXNzICVkOiAlcyIsIG1fc29ja2V0RGVzY3JpcHRvciwgZ2V0Q3VycmVudFByb2Nlc3NJ RCgpLCBzdHJlcnJvcihlcnJubykpOwogICAgICAgICAgICAgICAgIGNvbm5lY3Rpb25EaWRDbG9z ZSgpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViTWVtb3J5U2FtcGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJNZW1vcnlTYW1wbGVyLmNwcAppbmRleCA5Mjc3MTg5NmYzMS4uZjZjNzkyY2JiZmMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYk1lbW9yeVNhbXBsZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYk1lbW9yeVNhbXBsZXIuY3BwCkBAIC0yOSw3ICsy OSw3IEBACiAjaWYgRU5BQkxFKE1FTU9SWV9TQU1QTEVSKQogCiAjaW5jbHVkZSA8c3RkaW8uaD4K LSNpbmNsdWRlIDx1bmlzdGQuaD4KKyNpbmNsdWRlIDx3dGYvUHJvY2Vzc0lELmg+CiAjaW5jbHVk ZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIu aD4KIApAQCAtODksNyArODksNyBAQCB2b2lkIFdlYk1lbW9yeVNhbXBsZXI6OnN0YXJ0KFNhbmRi b3hFeHRlbnNpb246OkhhbmRsZSYmIHNhbXBsZUxvZ0ZpbGVIYW5kbGUsIGNvbgogdm9pZCBXZWJN ZW1vcnlTYW1wbGVyOjppbml0aWFsaXplVGltZXJzKGRvdWJsZSBpbnRlcnZhbCkKIHsKICAgICBt X3NhbXBsZVRpbWVyLnN0YXJ0UmVwZWF0aW5nKDFfcyk7Ci0gICAgcHJpbnRmKCJTdGFydGVkIG1l bW9yeSBzYW1wbGVyIGZvciBwcm9jZXNzICVzICVkIiwgcHJvY2Vzc05hbWUoKS51dGY4KCkuZGF0 YSgpLCBnZXRwaWQoKSk7CisgICAgcHJpbnRmKCJTdGFydGVkIG1lbW9yeSBzYW1wbGVyIGZvciBw cm9jZXNzICVzICVkIiwgcHJvY2Vzc05hbWUoKS51dGY4KCkuZGF0YSgpLCBnZXRDdXJyZW50UHJv Y2Vzc0lEKCkpOwogICAgIGlmIChpbnRlcnZhbCA+IDApIHsKICAgICAgICAgbV9zdG9wVGltZXIu c3RhcnRPbmVTaG90KDFfcyAqIGludGVydmFsKTsKICAgICAgICAgcHJpbnRmKCIgZm9yIGEgaW50 ZXJ2YWwgb2YgJWcgc2Vjb25kcyIsIGludGVydmFsKTsKQEAgLTEwNiw3ICsxMDYsNyBAQCB2b2lk IFdlYk1lbW9yeVNhbXBsZXI6OnN0b3AoKQogICAgIG1fc2FtcGxlVGltZXIuc3RvcCgpOwogICAg IEZpbGVTeXN0ZW06OmNsb3NlRmlsZShtX3NhbXBsZUxvZ0ZpbGUpOwogCi0gICAgcHJpbnRmKCJT dG9wcGVkIG1lbW9yeSBzYW1wbGVyIGZvciBwcm9jZXNzICVzICVkXG4iLCBwcm9jZXNzTmFtZSgp LnV0ZjgoKS5kYXRhKCksIGdldHBpZCgpKTsKKyAgICBwcmludGYoIlN0b3BwZWQgbWVtb3J5IHNh bXBsZXIgZm9yIHByb2Nlc3MgJXMgJWRcbiIsIHByb2Nlc3NOYW1lKCkudXRmOCgpLmRhdGEoKSwg Z2V0Q3VycmVudFByb2Nlc3NJRCgpKTsKICAgICAvLyBGbHVzaCBzdGRvdXQgYnVmZmVyIHNvIHB5 dGhvbiBzY3JpcHQgY2FuIGJlIGd1YXJhbnRlZWQgdG8gcmVhZCB1cCB0byB0aGlzIHBvaW50Lgog ICAgIGZmbHVzaChzdGRvdXQpOwogICAgIG1faXNSdW5uaW5nID0gZmFsc2U7CkBAIC0xNDMsNyAr MTQzLDcgQEAgdm9pZCBXZWJNZW1vcnlTYW1wbGVyOjppbml0aWFsaXplU2FuZGJveGVkTG9nRmls ZShTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmJiBzYW0KIAogdm9pZCBXZWJNZW1vcnlTYW1wbGVy Ojp3cml0ZUhlYWRlcnMoKQogewotICAgIFN0cmluZyBwcm9jZXNzRGV0YWlscyA9IFN0cmluZzo6 Zm9ybWF0KCJQcm9jZXNzOiAlcyBQaWQ6ICVkXG4iLCBwcm9jZXNzTmFtZSgpLnV0ZjgoKS5kYXRh KCksIGdldHBpZCgpKTsKKyAgICBTdHJpbmcgcHJvY2Vzc0RldGFpbHMgPSBTdHJpbmc6OmZvcm1h dCgiUHJvY2VzczogJXMgUGlkOiAlZFxuIiwgcHJvY2Vzc05hbWUoKS51dGY4KCkuZGF0YSgpLCBn ZXRDdXJyZW50UHJvY2Vzc0lEKCkpOwogCiAgICAgQ1N0cmluZyB1dGY4U3RyaW5nID0gcHJvY2Vz c0RldGFpbHMudXRmOCgpOwogICAgIEZpbGVTeXN0ZW06OndyaXRlVG9GaWxlKG1fc2FtcGxlTG9n RmlsZSwgdXRmOFN0cmluZy5kYXRhKCksIHV0ZjhTdHJpbmcubGVuZ3RoKCkpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNv bm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250 ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCmluZGV4IGZhYTdlMzlkYTM2Li4yY2ZiM2NhMWQzYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250ZXh0 TWFuYWdlckNvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9y YWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcApAQCAtNTcsNiArNTcsNyBAQAog I2luY2x1ZGUgPFdlYkNvcmUvU2VydmljZVdvcmtlckpvYkRhdGFJZGVudGlmaWVyLmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9Vc2VyQWdlbnQuaD4KICNpbmNsdWRlIDxwYWwvU2Vzc2lvbklELmg+Cisj aW5jbHVkZSA8d3RmL1Byb2Nlc3NJRC5oPgogCiAjaWYgVVNFKFFVSUNLX0xPT0spCiAjaW5jbHVk ZSA8V2ViQ29yZS9QcmV2aWV3TG9hZGVyQ2xpZW50Lmg+CkBAIC0xNjAsNyArMTYxLDcgQEAgdm9p ZCBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbjo6aW5zdGFsbFNlcnZpY2VXb3JrZXIoY29u c3QgU2VydmljZVdvcmtlckNvbnQKICAgICBhdXRvIHNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eSA9 IFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eTo6Y3JlYXRlKFdURk1vdmUocGFnZUNvbmZpZ3VyYXRp b24pLCBkYXRhLCBzZXNzaW9uSUQsIFN0cmluZyB7IG1fdXNlckFnZW50IH0sIFdlYlByb2Nlc3M6 OnNpbmdsZXRvbigpLmNhY2hlU3RvcmFnZVByb3ZpZGVyKCksIG1fc3RvcmFnZUJsb2NraW5nUG9s aWN5KTsKICAgICBTV0NvbnRleHRNYW5hZ2VyOjpzaW5nbGV0b24oKS5yZWdpc3RlclNlcnZpY2VX b3JrZXJUaHJlYWRGb3JJbnN0YWxsKFdURk1vdmUoc2VydmljZVdvcmtlclRocmVhZFByb3h5KSk7 CiAKLSAgICBMT0coU2VydmljZVdvcmtlciwgIkNvbnRleHQgcHJvY2VzcyBQSUQ6ICVpIGNyZWF0 ZWQgd29ya2VyIHRocmVhZFxuIiwgZ2V0cGlkKCkpOworICAgIExPRyhTZXJ2aWNlV29ya2VyLCAi Q29udGV4dCBwcm9jZXNzIFBJRDogJWkgY3JlYXRlZCB3b3JrZXIgdGhyZWFkXG4iLCBnZXRDdXJy ZW50UHJvY2Vzc0lEKCkpOwogfQogCiB2b2lkIFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9u OjpzZXRVc2VyQWdlbnQoU3RyaW5nJiYgdXNlckFnZW50KQo= 343080 2018-06-19 12:37:22 -0700 2018-06-19 13:47:25 -0700 Patch bug-186813.diff text/plain 6890 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ZTdhZDMwY2Q4Mi4uZDZiOTViM2I1OTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxOC0wNi0xOSAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnku Y29tPgorCisgICAgICAgIFVzZSBnZXRDdXJyZW50UHJvY2Vzc0lEIG92ZXIgZ2V0cGlkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY4MTMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMu IE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3gx MS9YRXJyb3JUcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhFcnJvclRyYXBwZXI6OmVy cm9yRXZlbnQpOgorCiAyMDE4LTA2LTE5ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2ZXJ0OiBBZGQgbG9nZ2luZyB3aGVuIHNwbGFzaGJvYXJkZCBlbmFi bGVzIFdlYlRocmVhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MveDExL1hFcnJvclRyYXBwZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MveDExL1hFcnJvclRyYXBwZXIuY3BwCmluZGV4IDZmZDRkNDlkZmUzLi4xNjM3NmQ5ZjgzZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MveDExL1hFcnJvclRy YXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3gxMS9YRXJy b3JUcmFwcGVyLmNwcApAQCAtMjgsOSArMjgsOSBAQAogCiAjaWYgUExBVEZPUk0oWDExKQogI2lu Y2x1ZGUgPHN5cy90eXBlcy5oPgotI2luY2x1ZGUgPHVuaXN0ZC5oPgogI2luY2x1ZGUgPHd0Zi9I YXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CisjaW5jbHVkZSA8d3Rm L1Byb2Nlc3NJRC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTkwLDcgKzkwLDcgQEAg dm9pZCBYRXJyb3JUcmFwcGVyOjplcnJvckV2ZW50KFhFcnJvckV2ZW50KiBldmVudCkKICAgICAg ICAgIiAgKERldGFpbHM6IHNlcmlhbCAlbGQgZXJyb3JfY29kZSAlZCByZXF1ZXN0X2NvZGUgJWQg bWlub3JfY29kZSAlZClcbiI7CiAgICAgY2hhciBlcnJvck1lc3NhZ2VbNjRdOwogICAgIFhHZXRF cnJvclRleHQobV9kaXNwbGF5LCBtX2Vycm9yQ29kZSwgZXJyb3JNZXNzYWdlLCA2Myk7Ci0gICAg V1RGTG9nQWx3YXlzKGVycm9yRm9ybWF0U3RyaW5nLCBnZXRwaWQoKSwgZXJyb3JNZXNzYWdlLCBl dmVudC0+c2VyaWFsLCBldmVudC0+ZXJyb3JfY29kZSwgZXZlbnQtPnJlcXVlc3RfY29kZSwgZXZl bnQtPm1pbm9yX2NvZGUpOworICAgIFdURkxvZ0Fsd2F5cyhlcnJvckZvcm1hdFN0cmluZywgZ2V0 Q3VycmVudFByb2Nlc3NJRCgpLCBlcnJvck1lc3NhZ2UsIGV2ZW50LT5zZXJpYWwsIGV2ZW50LT5l cnJvcl9jb2RlLCBldmVudC0+cmVxdWVzdF9jb2RlLCBldmVudC0+bWlub3JfY29kZSk7CiAKICAg ICBpZiAobV9wb2xpY3kgPT0gUG9saWN5OjpDcmFzaCkKICAgICAgICAgQ1JBU0goKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK aW5kZXggMTNmM2FkN2FjODcuLjRmNDQ1MzE1MTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBA CisyMDE4LTA2LTE5ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+CisKKyAg ICAgICAgVXNlIGdldEN1cnJlbnRQcm9jZXNzSUQgb3ZlciBnZXRwaWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjgxMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGxhdGZvcm0vSVBDL3VuaXgvQ29u bmVjdGlvblVuaXguY3BwOgorICAgICAgICAoSVBDOjpDb25uZWN0aW9uOjpyZWFkeVJlYWRIYW5k bGVyKToKKyAgICAgICAgKiBTaGFyZWQvV2ViTWVtb3J5U2FtcGxlci5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYk1lbW9yeVNhbXBsZXI6OmluaXRpYWxpemVUaW1lcnMpOgorICAgICAgICAoV2Vi S2l0OjpXZWJNZW1vcnlTYW1wbGVyOjpzdG9wKToKKyAgICAgICAgKFdlYktpdDo6V2ViTWVtb3J5 U2FtcGxlcjo6d3JpdGVIZWFkZXJzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1N0b3JhZ2UvV2Vi U1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJTV0Nv bnRleHRNYW5hZ2VyQ29ubmVjdGlvbjo6aW5zdGFsbFNlcnZpY2VXb3JrZXIpOgorCiAyMDE4LTA2 LTE5ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtX ZWJLaXQgb24gd2F0Y2hPU10gVmVuZCB1c2VybmFtZSB0ZXh0IGNvbnRlbnQgdHlwZSB3aGVuIHVz aW5nIHNjcmliYmxlIGluIGxvZ2luIGZpZWxkcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9Q bGF0Zm9ybS9JUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1BsYXRm b3JtL0lQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcAppbmRleCAzYzQ2Mzk0ZTJlMy4uOWRhOTY1 YzEzZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL3VuaXgvQ29ubmVj dGlvblVuaXguY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL3VuaXgvQ29ubmVj dGlvblVuaXguY3BwCkBAIC0zMiwxMSArMzIsMTEgQEAKICNpbmNsdWRlICJTaGFyZWRNZW1vcnku aCIKICNpbmNsdWRlICJVbml4TWVzc2FnZS5oIgogI2luY2x1ZGUgPHN5cy9zb2NrZXQuaD4KLSNp bmNsdWRlIDx1bmlzdGQuaD4KICNpbmNsdWRlIDxlcnJuby5oPgogI2luY2x1ZGUgPGZjbnRsLmg+ CiAjaW5jbHVkZSA8cG9sbC5oPgogI2luY2x1ZGUgPHd0Zi9Bc3NlcnRpb25zLmg+CisjaW5jbHVk ZSA8d3RmL1Byb2Nlc3NJRC5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KICNpbmNs dWRlIDx3dGYvVW5pU3RkRXh0cmFzLmg+CiAKQEAgLTMwOCw3ICszMDgsNyBAQCB2b2lkIENvbm5l Y3Rpb246OnJlYWR5UmVhZEhhbmRsZXIoKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAogICAg ICAgICAgICAgaWYgKG1faXNDb25uZWN0ZWQpIHsKLSAgICAgICAgICAgICAgICBXVEZMb2dBbHdh eXMoIkVycm9yIHJlY2VpdmluZyBJUEMgbWVzc2FnZSBvbiBzb2NrZXQgJWQgaW4gcHJvY2VzcyAl ZDogJXMiLCBtX3NvY2tldERlc2NyaXB0b3IsIGdldHBpZCgpLCBzdHJlcnJvcihlcnJubykpOwor ICAgICAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiRXJyb3IgcmVjZWl2aW5nIElQQyBtZXNzYWdl IG9uIHNvY2tldCAlZCBpbiBwcm9jZXNzICVkOiAlcyIsIG1fc29ja2V0RGVzY3JpcHRvciwgZ2V0 Q3VycmVudFByb2Nlc3NJRCgpLCBzdHJlcnJvcihlcnJubykpOwogICAgICAgICAgICAgICAgIGNv bm5lY3Rpb25EaWRDbG9zZSgpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViTWVtb3J5U2FtcGxlci5jcHAgYi9T b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJNZW1vcnlTYW1wbGVyLmNwcAppbmRleCA5Mjc3MTg5NmYz MS4uZjZjNzkyY2JiZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYk1lbW9y eVNhbXBsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYk1lbW9yeVNhbXBsZXIu Y3BwCkBAIC0yOSw3ICsyOSw3IEBACiAjaWYgRU5BQkxFKE1FTU9SWV9TQU1QTEVSKQogCiAjaW5j bHVkZSA8c3RkaW8uaD4KLSNpbmNsdWRlIDx1bmlzdGQuaD4KKyNpbmNsdWRlIDx3dGYvUHJvY2Vz c0lELmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0 L1N0cmluZ0J1aWxkZXIuaD4KIApAQCAtODksNyArODksNyBAQCB2b2lkIFdlYk1lbW9yeVNhbXBs ZXI6OnN0YXJ0KFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYmIHNhbXBsZUxvZ0ZpbGVIYW5kbGUs IGNvbgogdm9pZCBXZWJNZW1vcnlTYW1wbGVyOjppbml0aWFsaXplVGltZXJzKGRvdWJsZSBpbnRl cnZhbCkKIHsKICAgICBtX3NhbXBsZVRpbWVyLnN0YXJ0UmVwZWF0aW5nKDFfcyk7Ci0gICAgcHJp bnRmKCJTdGFydGVkIG1lbW9yeSBzYW1wbGVyIGZvciBwcm9jZXNzICVzICVkIiwgcHJvY2Vzc05h bWUoKS51dGY4KCkuZGF0YSgpLCBnZXRwaWQoKSk7CisgICAgcHJpbnRmKCJTdGFydGVkIG1lbW9y eSBzYW1wbGVyIGZvciBwcm9jZXNzICVzICVkIiwgcHJvY2Vzc05hbWUoKS51dGY4KCkuZGF0YSgp LCBnZXRDdXJyZW50UHJvY2Vzc0lEKCkpOwogICAgIGlmIChpbnRlcnZhbCA+IDApIHsKICAgICAg ICAgbV9zdG9wVGltZXIuc3RhcnRPbmVTaG90KDFfcyAqIGludGVydmFsKTsKICAgICAgICAgcHJp bnRmKCIgZm9yIGEgaW50ZXJ2YWwgb2YgJWcgc2Vjb25kcyIsIGludGVydmFsKTsKQEAgLTEwNiw3 ICsxMDYsNyBAQCB2b2lkIFdlYk1lbW9yeVNhbXBsZXI6OnN0b3AoKQogICAgIG1fc2FtcGxlVGlt ZXIuc3RvcCgpOwogICAgIEZpbGVTeXN0ZW06OmNsb3NlRmlsZShtX3NhbXBsZUxvZ0ZpbGUpOwog Ci0gICAgcHJpbnRmKCJTdG9wcGVkIG1lbW9yeSBzYW1wbGVyIGZvciBwcm9jZXNzICVzICVkXG4i LCBwcm9jZXNzTmFtZSgpLnV0ZjgoKS5kYXRhKCksIGdldHBpZCgpKTsKKyAgICBwcmludGYoIlN0 b3BwZWQgbWVtb3J5IHNhbXBsZXIgZm9yIHByb2Nlc3MgJXMgJWRcbiIsIHByb2Nlc3NOYW1lKCku dXRmOCgpLmRhdGEoKSwgZ2V0Q3VycmVudFByb2Nlc3NJRCgpKTsKICAgICAvLyBGbHVzaCBzdGRv dXQgYnVmZmVyIHNvIHB5dGhvbiBzY3JpcHQgY2FuIGJlIGd1YXJhbnRlZWQgdG8gcmVhZCB1cCB0 byB0aGlzIHBvaW50LgogICAgIGZmbHVzaChzdGRvdXQpOwogICAgIG1faXNSdW5uaW5nID0gZmFs c2U7CkBAIC0xNDMsNyArMTQzLDcgQEAgdm9pZCBXZWJNZW1vcnlTYW1wbGVyOjppbml0aWFsaXpl U2FuZGJveGVkTG9nRmlsZShTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmJiBzYW0KIAogdm9pZCBX ZWJNZW1vcnlTYW1wbGVyOjp3cml0ZUhlYWRlcnMoKQogewotICAgIFN0cmluZyBwcm9jZXNzRGV0 YWlscyA9IFN0cmluZzo6Zm9ybWF0KCJQcm9jZXNzOiAlcyBQaWQ6ICVkXG4iLCBwcm9jZXNzTmFt ZSgpLnV0ZjgoKS5kYXRhKCksIGdldHBpZCgpKTsKKyAgICBTdHJpbmcgcHJvY2Vzc0RldGFpbHMg PSBTdHJpbmc6OmZvcm1hdCgiUHJvY2VzczogJXMgUGlkOiAlZFxuIiwgcHJvY2Vzc05hbWUoKS51 dGY4KCkuZGF0YSgpLCBnZXRDdXJyZW50UHJvY2Vzc0lEKCkpOwogCiAgICAgQ1N0cmluZyB1dGY4 U3RyaW5nID0gcHJvY2Vzc0RldGFpbHMudXRmOCgpOwogICAgIEZpbGVTeXN0ZW06OndyaXRlVG9G aWxlKG1fc2FtcGxlTG9nRmlsZSwgdXRmOFN0cmluZy5kYXRhKCksIHV0ZjhTdHJpbmcubGVuZ3Ro KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dD b250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0 b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCmluZGV4IGZhYTdlMzlkYTM2 Li4yY2ZiM2NhMWQzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3Jh Z2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcApAQCAt NTcsNiArNTcsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvU2VydmljZVdvcmtlckpvYkRhdGFJZGVu dGlmaWVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Vc2VyQWdlbnQuaD4KICNpbmNsdWRlIDxwYWwv U2Vzc2lvbklELmg+CisjaW5jbHVkZSA8d3RmL1Byb2Nlc3NJRC5oPgogCiAjaWYgVVNFKFFVSUNL X0xPT0spCiAjaW5jbHVkZSA8V2ViQ29yZS9QcmV2aWV3TG9hZGVyQ2xpZW50Lmg+CkBAIC0xNjAs NyArMTYxLDcgQEAgdm9pZCBXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbjo6aW5zdGFsbFNl cnZpY2VXb3JrZXIoY29uc3QgU2VydmljZVdvcmtlckNvbnQKICAgICBhdXRvIHNlcnZpY2VXb3Jr ZXJUaHJlYWRQcm94eSA9IFNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eTo6Y3JlYXRlKFdURk1vdmUo cGFnZUNvbmZpZ3VyYXRpb24pLCBkYXRhLCBzZXNzaW9uSUQsIFN0cmluZyB7IG1fdXNlckFnZW50 IH0sIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmNhY2hlU3RvcmFnZVByb3ZpZGVyKCksIG1fc3Rv cmFnZUJsb2NraW5nUG9saWN5KTsKICAgICBTV0NvbnRleHRNYW5hZ2VyOjpzaW5nbGV0b24oKS5y ZWdpc3RlclNlcnZpY2VXb3JrZXJUaHJlYWRGb3JJbnN0YWxsKFdURk1vdmUoc2VydmljZVdvcmtl clRocmVhZFByb3h5KSk7CiAKLSAgICBMT0coU2VydmljZVdvcmtlciwgIkNvbnRleHQgcHJvY2Vz cyBQSUQ6ICVpIGNyZWF0ZWQgd29ya2VyIHRocmVhZFxuIiwgZ2V0cGlkKCkpOworICAgIExPRyhT ZXJ2aWNlV29ya2VyLCAiQ29udGV4dCBwcm9jZXNzIFBJRDogJWkgY3JlYXRlZCB3b3JrZXIgdGhy ZWFkXG4iLCBnZXRDdXJyZW50UHJvY2Vzc0lEKCkpOwogfQogCiB2b2lkIFdlYlNXQ29udGV4dE1h bmFnZXJDb25uZWN0aW9uOjpzZXRVc2VyQWdlbnQoU3RyaW5nJiYgdXNlckFnZW50KQo= 343092 2018-06-19 13:47:25 -0700 2018-06-19 15:02:40 -0700 Patch bug-186813.diff text/plain 4038 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMTNmM2FkN2FjODcuLjM2NWQ2ZWM4ODk3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDE4LTA2LTE5ICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CisKKyAgICAgICAgVXNlIGdldEN1cnJlbnRQcm9jZXNzSUQgb3ZlciBnZXRwaWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjgxMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYk1lbW9y eVNhbXBsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJNZW1vcnlTYW1wbGVyOjppbml0aWFs aXplVGltZXJzKToKKyAgICAgICAgKFdlYktpdDo6V2ViTWVtb3J5U2FtcGxlcjo6c3RvcCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYk1lbW9yeVNhbXBsZXI6OndyaXRlSGVhZGVycyk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb246Omluc3RhbGxT ZXJ2aWNlV29ya2VyKToKKwogMjAxOC0wNi0xOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVo QGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViS2l0IG9uIHdhdGNoT1NdIFZlbmQgdXNlcm5hbWUg dGV4dCBjb250ZW50IHR5cGUgd2hlbiB1c2luZyBzY3JpYmJsZSBpbiBsb2dpbiBmaWVsZHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYk1lbW9yeVNhbXBsZXIuY3BwIGIvU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViTWVtb3J5U2FtcGxlci5jcHAKaW5kZXggOTI3NzE4OTZmMzEu LmY2Yzc5MmNiYmZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJNZW1vcnlT YW1wbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJNZW1vcnlTYW1wbGVyLmNw cApAQCAtMjksNyArMjksNyBAQAogI2lmIEVOQUJMRShNRU1PUllfU0FNUExFUikKIAogI2luY2x1 ZGUgPHN0ZGlvLmg+Ci0jaW5jbHVkZSA8dW5pc3RkLmg+CisjaW5jbHVkZSA8d3RmL1Byb2Nlc3NJ RC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9T dHJpbmdCdWlsZGVyLmg+CiAKQEAgLTg5LDcgKzg5LDcgQEAgdm9pZCBXZWJNZW1vcnlTYW1wbGVy OjpzdGFydChTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmJiBzYW1wbGVMb2dGaWxlSGFuZGxlLCBj b24KIHZvaWQgV2ViTWVtb3J5U2FtcGxlcjo6aW5pdGlhbGl6ZVRpbWVycyhkb3VibGUgaW50ZXJ2 YWwpCiB7CiAgICAgbV9zYW1wbGVUaW1lci5zdGFydFJlcGVhdGluZygxX3MpOwotICAgIHByaW50 ZigiU3RhcnRlZCBtZW1vcnkgc2FtcGxlciBmb3IgcHJvY2VzcyAlcyAlZCIsIHByb2Nlc3NOYW1l KCkudXRmOCgpLmRhdGEoKSwgZ2V0cGlkKCkpOworICAgIHByaW50ZigiU3RhcnRlZCBtZW1vcnkg c2FtcGxlciBmb3IgcHJvY2VzcyAlcyAlZCIsIHByb2Nlc3NOYW1lKCkudXRmOCgpLmRhdGEoKSwg Z2V0Q3VycmVudFByb2Nlc3NJRCgpKTsKICAgICBpZiAoaW50ZXJ2YWwgPiAwKSB7CiAgICAgICAg IG1fc3RvcFRpbWVyLnN0YXJ0T25lU2hvdCgxX3MgKiBpbnRlcnZhbCk7CiAgICAgICAgIHByaW50 ZigiIGZvciBhIGludGVydmFsIG9mICVnIHNlY29uZHMiLCBpbnRlcnZhbCk7CkBAIC0xMDYsNyAr MTA2LDcgQEAgdm9pZCBXZWJNZW1vcnlTYW1wbGVyOjpzdG9wKCkKICAgICBtX3NhbXBsZVRpbWVy LnN0b3AoKTsKICAgICBGaWxlU3lzdGVtOjpjbG9zZUZpbGUobV9zYW1wbGVMb2dGaWxlKTsKIAot ICAgIHByaW50ZigiU3RvcHBlZCBtZW1vcnkgc2FtcGxlciBmb3IgcHJvY2VzcyAlcyAlZFxuIiwg cHJvY2Vzc05hbWUoKS51dGY4KCkuZGF0YSgpLCBnZXRwaWQoKSk7CisgICAgcHJpbnRmKCJTdG9w cGVkIG1lbW9yeSBzYW1wbGVyIGZvciBwcm9jZXNzICVzICVkXG4iLCBwcm9jZXNzTmFtZSgpLnV0 ZjgoKS5kYXRhKCksIGdldEN1cnJlbnRQcm9jZXNzSUQoKSk7CiAgICAgLy8gRmx1c2ggc3Rkb3V0 IGJ1ZmZlciBzbyBweXRob24gc2NyaXB0IGNhbiBiZSBndWFyYW50ZWVkIHRvIHJlYWQgdXAgdG8g dGhpcyBwb2ludC4KICAgICBmZmx1c2goc3Rkb3V0KTsKICAgICBtX2lzUnVubmluZyA9IGZhbHNl OwpAQCAtMTQzLDcgKzE0Myw3IEBAIHZvaWQgV2ViTWVtb3J5U2FtcGxlcjo6aW5pdGlhbGl6ZVNh bmRib3hlZExvZ0ZpbGUoU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiYgc2FtCiAKIHZvaWQgV2Vi TWVtb3J5U2FtcGxlcjo6d3JpdGVIZWFkZXJzKCkKIHsKLSAgICBTdHJpbmcgcHJvY2Vzc0RldGFp bHMgPSBTdHJpbmc6OmZvcm1hdCgiUHJvY2VzczogJXMgUGlkOiAlZFxuIiwgcHJvY2Vzc05hbWUo KS51dGY4KCkuZGF0YSgpLCBnZXRwaWQoKSk7CisgICAgU3RyaW5nIHByb2Nlc3NEZXRhaWxzID0g U3RyaW5nOjpmb3JtYXQoIlByb2Nlc3M6ICVzIFBpZDogJWRcbiIsIHByb2Nlc3NOYW1lKCkudXRm OCgpLmRhdGEoKSwgZ2V0Q3VycmVudFByb2Nlc3NJRCgpKTsKIAogICAgIENTdHJpbmcgdXRmOFN0 cmluZyA9IHByb2Nlc3NEZXRhaWxzLnV0ZjgoKTsKICAgICBGaWxlU3lzdGVtOjp3cml0ZVRvRmls ZShtX3NhbXBsZUxvZ0ZpbGUsIHV0ZjhTdHJpbmcuZGF0YSgpLCB1dGY4U3RyaW5nLmxlbmd0aCgp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNXQ29u dGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9y YWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcAppbmRleCBmYWE3ZTM5ZGEzNi4u MmNmYjNjYTFkM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdl L1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKQEAgLTU3 LDYgKzU3LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1NlcnZpY2VXb3JrZXJKb2JEYXRhSWRlbnRp Zmllci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvVXNlckFnZW50Lmg+CiAjaW5jbHVkZSA8cGFsL1Nl c3Npb25JRC5oPgorI2luY2x1ZGUgPHd0Zi9Qcm9jZXNzSUQuaD4KIAogI2lmIFVTRShRVUlDS19M T09LKQogI2luY2x1ZGUgPFdlYkNvcmUvUHJldmlld0xvYWRlckNsaWVudC5oPgpAQCAtMTYwLDcg KzE2MSw3IEBAIHZvaWQgV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb246Omluc3RhbGxTZXJ2 aWNlV29ya2VyKGNvbnN0IFNlcnZpY2VXb3JrZXJDb250CiAgICAgYXV0byBzZXJ2aWNlV29ya2Vy VGhyZWFkUHJveHkgPSBTZXJ2aWNlV29ya2VyVGhyZWFkUHJveHk6OmNyZWF0ZShXVEZNb3ZlKHBh Z2VDb25maWd1cmF0aW9uKSwgZGF0YSwgc2Vzc2lvbklELCBTdHJpbmcgeyBtX3VzZXJBZ2VudCB9 LCBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5jYWNoZVN0b3JhZ2VQcm92aWRlcigpLCBtX3N0b3Jh Z2VCbG9ja2luZ1BvbGljeSk7CiAgICAgU1dDb250ZXh0TWFuYWdlcjo6c2luZ2xldG9uKCkucmVn aXN0ZXJTZXJ2aWNlV29ya2VyVGhyZWFkRm9ySW5zdGFsbChXVEZNb3ZlKHNlcnZpY2VXb3JrZXJU aHJlYWRQcm94eSkpOwogCi0gICAgTE9HKFNlcnZpY2VXb3JrZXIsICJDb250ZXh0IHByb2Nlc3Mg UElEOiAlaSBjcmVhdGVkIHdvcmtlciB0aHJlYWRcbiIsIGdldHBpZCgpKTsKKyAgICBMT0coU2Vy dmljZVdvcmtlciwgIkNvbnRleHQgcHJvY2VzcyBQSUQ6ICVpIGNyZWF0ZWQgd29ya2VyIHRocmVh ZFxuIiwgZ2V0Q3VycmVudFByb2Nlc3NJRCgpKTsKIH0KIAogdm9pZCBXZWJTV0NvbnRleHRNYW5h Z2VyQ29ubmVjdGlvbjo6c2V0VXNlckFnZW50KFN0cmluZyYmIHVzZXJBZ2VudCkK