67908 2011-09-11 14:56:25 -0700 ThreadableWebSocketChannelClientWrapper shouldn't have a String in it. 2011-09-15 00:40:15 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68005 50099 1 levin yutak darin joenotcharles levin webkit.review.bot oldest_to_newest 465417 0 levin 2011-09-11 14:56:25 -0700 A String was introduced here: http://trac.webkit.org/changeset/92946/trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h This is a mistake because String's contain StringImpl which are RefCounted (not threadsafe) but ThreadableWebSocketChannelClientWrapper is threadsafe refcounted --i.e. it may destroyed on different threads (which will affect the String's refcouting). Please find a way to remove this as it may cause memory corruption, etc. 465465 1 yutak 2011-09-11 20:37:08 -0700 Oops sorry, I'll create a fix. Having Vector<UChar> in ThreadSafeRefCounted should be fine, right? 465469 2 levin 2011-09-11 20:44:26 -0700 (In reply to comment #1) > Oops sorry, I'll create a fix. No worries. > Having Vector<UChar> in ThreadSafeRefCounted should be fine, right? Yep, since there is no ref counting on that. It is simply owned by the class. Thanks! PS I'm fixing/investigating another issue and I just happened to come across this. 465546 3 107034 yutak 2011-09-12 03:05:56 -0700 Created attachment 107034 Patch 465608 4 107034 levin 2011-09-12 08:08:36 -0700 Comment on attachment 107034 Patch Thanks! 466260 5 107034 webkit.review.bot 2011-09-13 06:24:26 -0700 Comment on attachment 107034 Patch Clearing flags on attachment: 107034 Committed r95025: <http://trac.webkit.org/changeset/95025> 466261 6 webkit.review.bot 2011-09-13 06:24:30 -0700 All reviewed patches have been landed. Closing bug. 466291 7 darin 2011-09-13 07:47:35 -0700 This unusual idiom needs a comment. I don’t think it will be obvious to people reading this code in the future why a Vector<UChar> is used here. 466295 8 yutak 2011-09-13 08:10:44 -0700 There seem unexpected failures on SL bots; I'm reverting this change to investigate the regression. Darin: Sure -- I'm going to add comments when I re-land this patch. 466300 9 yutak 2011-09-13 08:16:21 -0700 Actual results: --- /Volumes/Big/slave/snowleopard-intel-debug-tests/build/layout-test-results/http/tests/websocket/tests/hybi/workers/no-subprotocol-expected.txt +++ /Volumes/Big/slave/snowleopard-intel-debug-tests/build/layout-test-results/http/tests/websocket/tests/hybi/workers/no-subprotocol-actual.txt @@ -4,12 +4,12 @@ PASS PASS: ws.protocol is equal to "" INFO: Connected -PASS PASS: ws.protocol is equal to "" +FAIL FAIL: ws.protocol should be "" but was "undefined" INFO: Closed -PASS PASS: ws.protocol is equal to "" +FAIL FAIL: ws.protocol should be "" but was "undefined" PASS PASS: closeEvent.wasClean is true INFO: Exited onclose handler -PASS PASS: ws.protocol is equal to "" +FAIL FAIL: ws.protocol should be "" but was "undefined" DONE PASS successfullyParsed is true 467347 10 joenotcharles 2011-09-14 14:37:52 -0700 Please mark this as blocking bug 50099 so that it's visible in the dependency graph. (I'd do it but I don't seem to have access.) 467349 11 levin 2011-09-14 14:40:16 -0700 (In reply to comment #10) > Please mark this as blocking bug 50099 so that it's visible in the dependency graph. (I'd do it but I don't seem to have access.) Try again :) 467398 12 joenotcharles 2011-09-14 15:22:08 -0700 That's better! 467651 13 yutak 2011-09-14 23:03:07 -0700 Argh! String(emptyVector) returns a null string, not an empty string! I'm going to fix and re-land soon. 467652 14 levin 2011-09-14 23:04:41 -0700 Sounds like a pretty simple modification r=me on that change to this patch :). 467654 15 yutak 2011-09-14 23:19:49 -0700 Thanks! 467663 16 107463 yutak 2011-09-14 23:38:57 -0700 Created attachment 107463 Patch for landing 467690 17 107463 webkit.review.bot 2011-09-15 00:40:10 -0700 Comment on attachment 107463 Patch for landing Clearing flags on attachment: 107463 Committed r95176: <http://trac.webkit.org/changeset/95176> 467691 18 webkit.review.bot 2011-09-15 00:40:15 -0700 All reviewed patches have been landed. Closing bug. 107034 2011-09-12 03:05:56 -0700 2011-09-14 23:38:53 -0700 Patch bug-67908-20110912190555.patch text/plain 3444 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ5NDQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxNmIyOTI5NmRhMjhjZmEx Y2ZmZjc2Y2NlMTA4MGFiMTFhYzJjMWYwLi5mMTY3ODNjM2VlNWFlYTU4YmM3ZWVlZWMyMGE4ZTll MzdlYjlmNDkzIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDktMTIgIFl1dGEg S2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVGhyZWFkYWJsZVdlYlNv Y2tldENoYW5uZWxDbGllbnRXcmFwcGVyIHNob3VsZG4ndCBoYXZlIGEgU3RyaW5nIGluIGl0Lgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njc5MDgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlIGEg U3RyaW5nIG1lbWJlciB2YXJpYWJsZSBpbiBUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVu dFdyYXBwZXIgd2l0aCBWZWN0b3I8VUNoYXI+LgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5j dGlvbmFsaXR5LCB0aHVzIG5vIG5ldyB0ZXN0cy4gV2ViU29ja2V0IHdvcmtlciB0ZXN0cworICAg ICAgICAodGVzdHMgdW5kZXIgaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMve2hpeGllNzYsaHli aX0vd29ya2Vycy8pIHNob3VsZCBrZWVwIHBhc3NpbmcuCisKKyAgICAgICAgKiB3ZWJzb2NrZXRz L1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXI6OlRocmVhZGFi bGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlOjpUaHJl YWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXI6OnN1YnByb3RvY29sKToKKyAgICAg ICAgQ3JlYXRlIGEgU3RyaW5nIGZyb20gVmVjdG9yPFVDaGFyPi4KKyAgICAgICAgKFdlYkNvcmU6 OlRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcjo6c2V0U3VicHJvdG9jb2wp OgorICAgICAgICBDb3B5IHRoZSBjb250ZW50IG9mIHRoZSBnaXZlbiBTdHJpbmcgaW50byBWZWN0 b3IuCisgICAgICAgICogd2Vic29ja2V0cy9UaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVu dFdyYXBwZXIuaDoKKwogMjAxMS0wOS0xMSAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHI4NzM1MSk6IHRvZ2dsaW5nIGRpc3Bs YXkgb2YgbG90cyAodGhvdXNhbmRzKSBvZiBlbGVtZW50cyB3aXRoIGRpc3BsYXk6bm9uZSBpcyB2 ZXJ5IHNsb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvVGhyZWFkYWJs ZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dlYnNv Y2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyLmNwcAppbmRleCAy ZWVjYzY5NTYyZWFlMTQyOTA3MjczMzAxOTc0MjNlMjI5NDVkYTAwLi4yZDZkMWRkZWIxOTdjZDU4 YTRkYTA4ODFkMWU1ZjE3MDdhODE5NmE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93ZWJz b2NrZXRzL1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9UaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVu dFdyYXBwZXIuY3BwCkBAIC00NCw3ICs0NCw2IEBAIFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVs Q2xpZW50V3JhcHBlcjo6VGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyCiAg ICAgOiBtX2NsaWVudChjbGllbnQpCiAgICAgLCBtX3N5bmNNZXRob2REb25lKGZhbHNlKQogICAg ICwgbV91c2VIaXhpZTc2UHJvdG9jb2wodHJ1ZSkKLSAgICAsIG1fc3VicHJvdG9jb2woIiIpCiAg ICAgLCBtX3NlbmRSZXF1ZXN0UmVzdWx0KGZhbHNlKQogICAgICwgbV9idWZmZXJlZEFtb3VudCgw KQogICAgICwgbV9zdXNwZW5kZWQoZmFsc2UpCkBAIC04MywxMiArODIsMTUgQEAgdm9pZCBUaHJl YWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXI6OnNldFVzZUhpeGllNzZQcm90b2Nv bChib29sIHVzZUhpeGkKIAogU3RyaW5nIFRocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50 V3JhcHBlcjo6c3VicHJvdG9jb2woKSBjb25zdAogewotICAgIHJldHVybiBtX3N1YnByb3RvY29s OworICAgIHJldHVybiBTdHJpbmcobV9zdWJwcm90b2NvbCk7CiB9CiAKIHZvaWQgVGhyZWFkYWJs ZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyOjpzZXRTdWJwcm90b2NvbChjb25zdCBTdHJp bmcmIHN1YnByb3RvY29sKQogewotICAgIG1fc3VicHJvdG9jb2wgPSBzdWJwcm90b2NvbDsKKyAg ICB1bnNpZ25lZCBsZW5ndGggPSBzdWJwcm90b2NvbC5sZW5ndGgoKTsKKyAgICBtX3N1YnByb3Rv Y29sLnJlc2l6ZShsZW5ndGgpOworICAgIGlmIChsZW5ndGgpCisgICAgICAgIG1lbWNweShtX3N1 YnByb3RvY29sLmRhdGEoKSwgc3VicHJvdG9jb2wuY2hhcmFjdGVycygpLCBzaXplb2YoVUNoYXIp ICogbGVuZ3RoKTsKIH0KIAogYm9vbCBUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdy YXBwZXI6OnNlbmRSZXF1ZXN0UmVzdWx0KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xp ZW50V3JhcHBlci5oCmluZGV4IGRkM2U2YTcwYzExYWU3NGU5ODJiZTI4ZWExMjEwN2U0YTE2ZDVl YTAuLjUwNTBkZGM3YmU4MTI4Mzk0YmY4ZThkYmVlMmU3MTM4NjY5NTE5NzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGll bnRXcmFwcGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9UaHJlYWRhYmxlV2Vi U29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXIuaApAQCAtOTMsNyArOTMsNyBAQCBwcm90ZWN0ZWQ6 CiAgICAgV2ViU29ja2V0Q2hhbm5lbENsaWVudCogbV9jbGllbnQ7CiAgICAgYm9vbCBtX3N5bmNN ZXRob2REb25lOwogICAgIGJvb2wgbV91c2VIaXhpZTc2UHJvdG9jb2w7Ci0gICAgU3RyaW5nIG1f c3VicHJvdG9jb2w7CisgICAgVmVjdG9yPFVDaGFyPiBtX3N1YnByb3RvY29sOwogICAgIGJvb2wg bV9zZW5kUmVxdWVzdFJlc3VsdDsKICAgICB1bnNpZ25lZCBsb25nIG1fYnVmZmVyZWRBbW91bnQ7 CiAgICAgYm9vbCBtX3N1c3BlbmRlZDsK 107463 2011-09-14 23:38:57 -0700 2011-09-15 00:40:10 -0700 Patch for landing bug-67908-20110915153855.patch text/plain 3993 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogOTUwODcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmZGY2Nzk0OTQ2MDI2MDA4 NDE5NTVhYWIzNjk3OTg5ZDg0Yjk2MmE2Li42ZmIwZDQxZWQzMTI4MDhhZDZiOTQwN2E4ZjZhNzBh MzRiMzRkOTA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDktMTUgIFl1dGEg S2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVGhyZWFkYWJsZVdlYlNv Y2tldENoYW5uZWxDbGllbnRXcmFwcGVyIHNob3VsZG4ndCBoYXZlIGEgU3RyaW5nIGluIGl0Lgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njc5MDgKKwor ICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KKworICAgICAgICBSZXBsYWNlIGEgU3Ry aW5nIG1lbWJlciB2YXJpYWJsZSBpbiBUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdy YXBwZXIgd2l0aCBWZWN0b3I8VUNoYXI+LgorCisgICAgICAgIFRocmVhZGFibGVXZWJTb2NrZXRD aGFubmVsQ2xpZW50V3JhcHBlciBpcyBkZXJpdmVkIGZyb20gVGhyZWFkU2FmZVJlZkNvdW50ZWQu IEl0IG1heSBiZQorICAgICAgICBkZXN0cm95ZWQgb24gZGlmZmVyZW50IHRocmVhZHMsIHdoaWNo IHdpbGwgYWZmZWN0IFN0cmluZydzIHJlZmNvdW50aW5nLiBUaGVyZWZvcmUsIGNsYXNzZXMKKyAg ICAgICAgZGVyaXZlZCBmcm9tIFRocmVhZFNhZmVSZWZDb3VudGVkIG11c3Qgbm90IGhhdmUgYSBT dHJpbmcgbWVtYmVyIHZhcmlhYmxlLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFs aXR5LCB0aHVzIG5vIG5ldyB0ZXN0cy4gV2ViU29ja2V0IHdvcmtlciB0ZXN0cworICAgICAgICAo dGVzdHMgdW5kZXIgaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMve2hpeGllNzYsaHliaX0vd29y a2Vycy8pIHNob3VsZCBrZWVwIHBhc3NpbmcuCisKKyAgICAgICAgKiB3ZWJzb2NrZXRzL1RocmVh ZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXI6OlRocmVhZGFibGVXZWJT b2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlOjpUaHJlYWRhYmxl V2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXI6OnN1YnByb3RvY29sKToKKyAgICAgICAgQ3Jl YXRlIGEgU3RyaW5nIGZyb20gVmVjdG9yPFVDaGFyPi4gTm90ZSB0aGF0IFN0cmluZyBjb25zdHJ1 Y3RvciB0YWtpbmcgYW4gZW1wdHkgdmVjdG9yIHJldHVybnMKKyAgICAgICAgYSBudWxsIHN0cmlu Zywgbm90IGFuIGVtcHR5IHN0cmluZy4gV2Ugd2FudCBhbiBlbXB0eSBzdHJpbmcgaW4gdGhhdCBj YXNlLCBzbyBJIGhhZCB0byBhZGQKKyAgICAgICAgc3BlY2lhbC1jYXNlIGhhbmRsaW5nIGZvciBh biBlbXB0eSB2ZWN0b3IuCisgICAgICAgIChXZWJDb3JlOjpUaHJlYWRhYmxlV2ViU29ja2V0Q2hh bm5lbENsaWVudFdyYXBwZXI6OnNldFN1YnByb3RvY29sKToKKyAgICAgICAgQ29weSB0aGUgY29u dGVudCBvZiB0aGUgZ2l2ZW4gU3RyaW5nIGludG8gVmVjdG9yLgorICAgICAgICAqIHdlYnNvY2tl dHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyLmg6CisKIDIwMTEtMDkt MTQgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI5NTA4MC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvVGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxD bGllbnRXcmFwcGVyLmNwcAppbmRleCAyZWVjYzY5NTYyZWFlMTQyOTA3MjczMzAxOTc0MjNlMjI5 NDVkYTAwLi4wZGU5ZjQxNTgyNmQ1ZDU2ZTU1ZGJmZTM1Y2Q3MjdiNmQ0YzRiM2RjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVs Q2xpZW50V3JhcHBlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9UaHJlYWRh YmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXIuY3BwCkBAIC00NCw3ICs0NCw2IEBAIFRo cmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcjo6VGhyZWFkYWJsZVdlYlNvY2tl dENoYW5uZWxDbGllbnRXcmFwcGVyCiAgICAgOiBtX2NsaWVudChjbGllbnQpCiAgICAgLCBtX3N5 bmNNZXRob2REb25lKGZhbHNlKQogICAgICwgbV91c2VIaXhpZTc2UHJvdG9jb2wodHJ1ZSkKLSAg ICAsIG1fc3VicHJvdG9jb2woIiIpCiAgICAgLCBtX3NlbmRSZXF1ZXN0UmVzdWx0KGZhbHNlKQog ICAgICwgbV9idWZmZXJlZEFtb3VudCgwKQogICAgICwgbV9zdXNwZW5kZWQoZmFsc2UpCkBAIC04 MywxMiArODIsMTcgQEAgdm9pZCBUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBw ZXI6OnNldFVzZUhpeGllNzZQcm90b2NvbChib29sIHVzZUhpeGkKIAogU3RyaW5nIFRocmVhZGFi bGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcjo6c3VicHJvdG9jb2woKSBjb25zdAogewot ICAgIHJldHVybiBtX3N1YnByb3RvY29sOworICAgIGlmIChtX3N1YnByb3RvY29sLmlzRW1wdHko KSkKKyAgICAgICAgcmV0dXJuIFN0cmluZygiIik7CisgICAgcmV0dXJuIFN0cmluZyhtX3N1YnBy b3RvY29sKTsKIH0KIAogdm9pZCBUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBw ZXI6OnNldFN1YnByb3RvY29sKGNvbnN0IFN0cmluZyYgc3VicHJvdG9jb2wpCiB7Ci0gICAgbV9z dWJwcm90b2NvbCA9IHN1YnByb3RvY29sOworICAgIHVuc2lnbmVkIGxlbmd0aCA9IHN1YnByb3Rv Y29sLmxlbmd0aCgpOworICAgIG1fc3VicHJvdG9jb2wucmVzaXplKGxlbmd0aCk7CisgICAgaWYg KGxlbmd0aCkKKyAgICAgICAgbWVtY3B5KG1fc3VicHJvdG9jb2wuZGF0YSgpLCBzdWJwcm90b2Nv bC5jaGFyYWN0ZXJzKCksIHNpemVvZihVQ2hhcikgKiBsZW5ndGgpOwogfQogCiBib29sIFRocmVh ZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlcjo6c2VuZFJlcXVlc3RSZXN1bHQoKSBj b25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9UaHJlYWRhYmxlV2Vi U29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMv VGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWxDbGllbnRXcmFwcGVyLmgKaW5kZXggZGQzZTZhNzBj MTFhZTc0ZTk4MmJlMjhlYTEyMTA3ZTRhMTZkNWVhMC4uYTIzYTVkZGJmOTQ2OGI4ZjIwYWU1Y2Yy ZGVmYTljMTQ4NDU3ZGIzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9U aHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbENsaWVudFdyYXBwZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS93ZWJzb2NrZXRzL1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlci5o CkBAIC05Myw3ICs5Myw3IEBAIHByb3RlY3RlZDoKICAgICBXZWJTb2NrZXRDaGFubmVsQ2xpZW50 KiBtX2NsaWVudDsKICAgICBib29sIG1fc3luY01ldGhvZERvbmU7CiAgICAgYm9vbCBtX3VzZUhp eGllNzZQcm90b2NvbDsKLSAgICBTdHJpbmcgbV9zdWJwcm90b2NvbDsKKyAgICBWZWN0b3I8VUNo YXI+IG1fc3VicHJvdG9jb2w7IC8vIFRocmVhZFNhZmVSZWZDb3VudGVkIG11c3Qgbm90IGhhdmUg YSBTdHJpbmcgbWVtYmVyIHZhcmlhYmxlLgogICAgIGJvb2wgbV9zZW5kUmVxdWVzdFJlc3VsdDsK ICAgICB1bnNpZ25lZCBsb25nIG1fYnVmZmVyZWRBbW91bnQ7CiAgICAgYm9vbCBtX3N1c3BlbmRl ZDsK