47809 2010-10-18 03:35:59 -0700 [Qt] QtTestBrowser: Prevent calling load() directly from loadFinished() in robot mode. 2010-10-27 14:39:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED Qt, QtTriaged P2 Enhancement --- 1 jturcotte jturcotte ademar kling webkit-ews oldest_to_newest 295426 0 jturcotte 2010-10-18 03:35:59 -0700 [Qt] QtTestBrowser: Prevent calling load() directly from loadFinished() in robot mode. 295427 1 71018 jturcotte 2010-10-18 03:37:57 -0700 Created attachment 71018 Patch 296041 2 71018 kling 2010-10-19 00:59:14 -0700 Comment on attachment 71018 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=71018&action=review Patch looks OK, but this makes me wonder: if starting a new load in direct response to loadFinished(bool) may cause crashes, shouldn't we be fixing that or documenting that fact? > WebKitTools/QtTestBrowser/urlloader.cpp:96 > + --m_numFramesLoading; We should ASSERT(m_numFramesLoading > 0); before this. 296060 3 71142 jturcotte 2010-10-19 01:53:08 -0700 Created attachment 71142 Patch 296067 4 webkit-ews 2010-10-19 02:14:14 -0700 Attachment 71142 did not build on qt: Build output: http://queues.webkit.org/results/4446084 296075 5 71142 kling 2010-10-19 02:39:56 -0700 Comment on attachment 71142 Patch r=me, but don't forget to add the missing include. ;) 296095 6 jturcotte 2010-10-19 03:37:00 -0700 Committed r70044: <http://trac.webkit.org/changeset/70044> 296213 7 jturcotte 2010-10-19 08:39:17 -0700 Blocking 2.1 to get it cherry-picked. This patch only affect QtTestBrowser and picking it should involve no risk. 296257 8 ademar 2010-10-19 10:17:48 -0700 Please block the candidates master bug, not the release critical (fixed). In practice the chances of being cherry-picked are almost the same - it all depends on the complexity and if it conflicts or not. 300590 9 ademar 2010-10-27 14:38:50 -0700 Revision r70044 cherry-picked into qtwebkit-2.1 with commit 4d3698b <http://gitorious.org/webkit/qtwebkit/commit/4d3698b> 71018 2010-10-18 03:37:57 -0700 2010-10-19 01:53:02 -0700 Patch bug-47809-20101018123741.patch text/plain 4637 jturcotte ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwYzdkZTlkNDYxYTY0MjU3N2QwZjgyYjUwNmIzOWE2MWNiMzhjNTU2Li5kYTQ1MGM1 ZmQyYjM4ZWYyNDA0MzUzZGRlZTRjOGYyNmJhOThmNGNjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAK KzIwMTAtMTAtMTggIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRd IFF0VGVzdEJyb3dzZXI6IFByZXZlbnQgY2FsbGluZyBsb2FkKCkgZGlyZWN0bHkgZnJvbSBsb2Fk RmluaXNoZWQoKSBpbiByb2JvdCBtb2RlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDc4MDkKKworICAgICAgICBDb25uZWN0aW5nIGEgY2FsbCB0byBs b2FkIGZyb20gdGhlIGxvYWRGaW5pc2hlZCBzaWduYWwgY2FuIGNhdXNlCisgICAgICAgIHJlLWVu dHJhbmNlIGNyYXNoZXMgaW4gV2ViQ29yZS4gVGhpcyBwYXRjaCB1c2VzIGEgdGltZXIgdG8gZG8g c28sCisgICAgICAgIGFsc28gZ2l2aW5nIHNvbWUgdGltZSB0byBzdWJzZXF1ZW50IGZyYW1lcyB0 byBmaW5pc2ggbG9hZGluZy4KKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvdXJsbG9hZGVyLmNw cDoKKyAgICAgICAgKFVybExvYWRlcjo6VXJsTG9hZGVyKToKKyAgICAgICAgKFVybExvYWRlcjo6 bG9hZE5leHQpOgorICAgICAgICAoVXJsTG9hZGVyOjpjaGVja0lmRmluaXNoZWQpOgorICAgICAg ICAoVXJsTG9hZGVyOjpmcmFtZUxvYWRTdGFydGVkKToKKyAgICAgICAgKFVybExvYWRlcjo6ZnJh bWVMb2FkRmluaXNoZWQpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvdXJsbG9hZGVyLmg6CisK IDIwMTAtMTAtMTQgIEFudG9uaW8gR29tZXMgIDxhZ29tZXNAcmltLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24gYW5kIFhhbiBMb3Blei4KZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvdXJsbG9hZGVyLmNwcCBiL1dlYktpdFRvb2xzL1F0VGVz dEJyb3dzZXIvdXJsbG9hZGVyLmNwcAppbmRleCBhYmU5OTAyODNlZmQwMGMzMThmMmZkMDFjZTc2 YTU0N2JiNGExNjZjLi4wYWY0ODhlNGYxNjYwZDBkY2FmZTQwOTk2MGZkYjJkYjE1NmYwNjU5IDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL3VybGxvYWRlci5jcHAKKysrIGIv V2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci91cmxsb2FkZXIuY3BwCkBAIC0zMCwxMiArMzAsMjEg QEAKIAogI2luY2x1ZGUgPFFGaWxlPgogI2luY2x1ZGUgPFFEZWJ1Zz4KKyNpbmNsdWRlIDxRV2Vi UGFnZT4KIAogVXJsTG9hZGVyOjpVcmxMb2FkZXIoUVdlYkZyYW1lKiBmcmFtZSwgY29uc3QgUVN0 cmluZyYgaW5wdXRGaWxlTmFtZSwgaW50IHRpbWVvdXRTZWNvbmRzLCBpbnQgZXh0cmFUaW1lU2Vj b25kcykKICAgICA6IG1fZnJhbWUoZnJhbWUpCiAgICAgLCBtX3N0ZE91dChzdGRvdXQpCiAgICAg LCBtX2xvYWRlZCgwKQorICAgICwgbV9udW1GcmFtZXNMb2FkaW5nKDApCiB7CisgICAgbV9jaGVj a0lmRmluaXNoZWRUaW1lci5zZXRJbnRlcnZhbCgyMDApOworICAgIG1fY2hlY2tJZkZpbmlzaGVk VGltZXIuc2V0U2luZ2xlU2hvdCh0cnVlKTsKKyAgICBjb25uZWN0KCZtX2NoZWNrSWZGaW5pc2hl ZFRpbWVyLCBTSUdOQUwodGltZW91dCgpKSwgdGhpcywgU0xPVChjaGVja0lmRmluaXNoZWQoKSkp OworICAgIC8vIGxvYWRTdGFydGVkIGFuZCBsb2FkRmluaXNoZWQgb24gUVdlYlBhZ2UgaXMgZW1p dHRlZCBmb3IgZWFjaCBmcmFtZS9zdWItZnJhbWUKKyAgICBjb25uZWN0KG1fZnJhbWUtPnBhZ2Uo KSwgU0lHTkFMKGxvYWRTdGFydGVkKCkpLCB0aGlzLCBTTE9UKGZyYW1lTG9hZFN0YXJ0ZWQoKSkp OworICAgIGNvbm5lY3QobV9mcmFtZS0+cGFnZSgpLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wp KSwgdGhpcywgU0xPVChmcmFtZUxvYWRGaW5pc2hlZCgpKSk7CisKICAgICBpZiAodGltZW91dFNl Y29uZHMpIHsKICAgICAgICAgbV90aW1lb3V0VGltZXIuc2V0SW50ZXJ2YWwodGltZW91dFNlY29u ZHMgKiAxMDAwKTsKICAgICAgICAgbV90aW1lb3V0VGltZXIuc2V0U2luZ2xlU2hvdCh0cnVlKTsK QEAgLTQ1LDEwICs1NCwxMCBAQCBVcmxMb2FkZXI6OlVybExvYWRlcihRV2ViRnJhbWUqIGZyYW1l LCBjb25zdCBRU3RyaW5nJiBpbnB1dEZpbGVOYW1lLCBpbnQgdGltZW91dAogICAgIGlmIChleHRy YVRpbWVTZWNvbmRzKSB7CiAgICAgICAgIG1fZXh0cmFUaW1lVGltZXIuc2V0SW50ZXJ2YWwoZXh0 cmFUaW1lU2Vjb25kcyAqIDEwMDApOwogICAgICAgICBtX2V4dHJhVGltZVRpbWVyLnNldFNpbmds ZVNob3QodHJ1ZSk7Ci0gICAgICAgIGNvbm5lY3QoZnJhbWUsIFNJR05BTChsb2FkRmluaXNoZWQo Ym9vbCkpLCAmbV9leHRyYVRpbWVUaW1lciwgU0xPVChzdGFydCgpKSk7CisgICAgICAgIGNvbm5l Y3QodGhpcywgU0lHTkFMKHBhZ2VMb2FkRmluaXNoZWQoKSksICZtX2V4dHJhVGltZVRpbWVyLCBT TE9UKHN0YXJ0KCkpKTsKICAgICAgICAgY29ubmVjdCgmbV9leHRyYVRpbWVUaW1lciwgU0lHTkFM KHRpbWVvdXQoKSksIHRoaXMsIFNMT1QobG9hZE5leHQoKSkpOwogICAgIH0gZWxzZQotICAgICAg ICBjb25uZWN0KGZyYW1lLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSwgdGhpcywgU0xPVChs b2FkTmV4dCgpKSk7CisgICAgICAgIGNvbm5lY3QodGhpcywgU0lHTkFMKHBhZ2VMb2FkRmluaXNo ZWQoKSksIHRoaXMsIFNMT1QobG9hZE5leHQoKSkpOwogICAgIGxvYWRVcmxMaXN0KGlucHV0Rmls ZU5hbWUpOwogfQogCkBAIC01Niw2ICs2NSw4IEBAIHZvaWQgVXJsTG9hZGVyOjpsb2FkTmV4dCgp CiB7CiAgICAgbV90aW1lb3V0VGltZXIuc3RvcCgpOwogICAgIG1fZXh0cmFUaW1lVGltZXIuc3Rv cCgpOworICAgIG1fY2hlY2tJZkZpbmlzaGVkVGltZXIuc3RvcCgpOworICAgIG1fbnVtRnJhbWVz TG9hZGluZyA9IDA7CiAgICAgUVN0cmluZyBxc3RyOwogICAgIGlmIChnZXRVcmwocXN0cikpIHsK ICAgICAgICAgUVVybCB1cmwocXN0ciwgUVVybDo6U3RyaWN0TW9kZSk7CkBAIC02OCw2ICs3OSwy NiBAQCB2b2lkIFVybExvYWRlcjo6bG9hZE5leHQoKQogICAgICAgICBkaXNjb25uZWN0KG1fZnJh bWUsIDAsIHRoaXMsIDApOwogfQogCit2b2lkIFVybExvYWRlcjo6Y2hlY2tJZkZpbmlzaGVkKCkK K3sKKyAgICBpZiAoIW1fbnVtRnJhbWVzTG9hZGluZykKKyAgICAgICAgZW1pdCBwYWdlTG9hZEZp bmlzaGVkKCk7Cit9CisKK3ZvaWQgVXJsTG9hZGVyOjpmcmFtZUxvYWRTdGFydGVkKCkKK3sKKyAg ICArK21fbnVtRnJhbWVzTG9hZGluZzsKKyAgICBtX2NoZWNrSWZGaW5pc2hlZFRpbWVyLnN0b3Ao KTsKK30KKwordm9pZCBVcmxMb2FkZXI6OmZyYW1lTG9hZEZpbmlzaGVkKCkKK3sKKyAgICAtLW1f bnVtRnJhbWVzTG9hZGluZzsKKyAgICAvLyBPbmNlIG91ciBmcmFtZSBoYXMgZmluaXNoZWQgbG9h ZGluZywgd2FpdCBhIG1vbWVudCB0byBjYWxsIGxvYWROZXh0IGZvciBjYXNlcworICAgIC8vIHdo ZXJlIGEgc3ViLWZyYW1lIHN0YXJ0cyBsb2FkaW5nIG9yIGFub3RoZXIgZnJhbWUgaXMgbG9hZGVk IHRocm91Z2ggSmF2YVNjcmlwdC4KKyAgICBtX2NoZWNrSWZGaW5pc2hlZFRpbWVyLnN0YXJ0KCk7 Cit9CisKIHZvaWQgVXJsTG9hZGVyOjpsb2FkVXJsTGlzdChjb25zdCBRU3RyaW5nJiBpbnB1dEZp bGVOYW1lKQogewogICAgIFFGaWxlIGlucHV0RmlsZShpbnB1dEZpbGVOYW1lKTsKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvdXJsbG9hZGVyLmggYi9XZWJLaXRUb29scy9R dFRlc3RCcm93c2VyL3VybGxvYWRlci5oCmluZGV4IGUyYTZkODcxZTk1YjgzMmU1NDcxOTQ1MDUz ZGU2ZGJmYWY5YjQ2ODYuLjhjZTI0YzBkMDMzNzdhYmY2ZWNkZWU1ZjhmNmE1N2NkMWYzZThmMDAg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvdXJsbG9hZGVyLmgKKysrIGIv V2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci91cmxsb2FkZXIuaApAQCAtNDQsNiArNDQsMTQgQEAg cHVibGljOgogcHVibGljIHNsb3RzOgogICAgIHZvaWQgbG9hZE5leHQoKTsKIAorcHJpdmF0ZSBz bG90czoKKyAgICB2b2lkIGNoZWNrSWZGaW5pc2hlZCgpOworICAgIHZvaWQgZnJhbWVMb2FkU3Rh cnRlZCgpOworICAgIHZvaWQgZnJhbWVMb2FkRmluaXNoZWQoKTsKKworc2lnbmFsczoKKyAgICB2 b2lkIHBhZ2VMb2FkRmluaXNoZWQoKTsKKwogcHJpdmF0ZToKICAgICB2b2lkIGxvYWRVcmxMaXN0 KGNvbnN0IFFTdHJpbmcmIGlucHV0RmlsZU5hbWUpOwogICAgIGJvb2wgZ2V0VXJsKFFTdHJpbmcm IHFzdHIpOwpAQCAtNTYsNiArNjQsOCBAQCBwcml2YXRlOgogICAgIGludCBtX2xvYWRlZDsKICAg ICBRVGltZXIgbV90aW1lb3V0VGltZXI7CiAgICAgUVRpbWVyIG1fZXh0cmFUaW1lVGltZXI7Cisg ICAgUVRpbWVyIG1fY2hlY2tJZkZpbmlzaGVkVGltZXI7CisgICAgaW50IG1fbnVtRnJhbWVzTG9h ZGluZzsKIH07CiAKICNlbmRpZgo= 71142 2010-10-19 01:53:08 -0700 2010-10-19 02:39:55 -0700 Patch bug-47809-20101019105248.patch text/plain 4657 jturcotte ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiM2IzYjdkZGFmOWI4Y2I4YzZjZThkNDA2YmQ5Y2EyMjczNTYxMjNmLi5iOTUyYTkw ODQwNWM2NGEzMmEzMGFiZDM5ZGExN2RhM2U1MmRlZWFiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAK KzIwMTAtMTAtMTggIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRd IFF0VGVzdEJyb3dzZXI6IFByZXZlbnQgY2FsbGluZyBsb2FkKCkgZGlyZWN0bHkgZnJvbSBsb2Fk RmluaXNoZWQoKSBpbiByb2JvdCBtb2RlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDc4MDkKKworICAgICAgICBDb25uZWN0aW5nIGEgY2FsbCB0byBs b2FkIGZyb20gdGhlIGxvYWRGaW5pc2hlZCBzaWduYWwgY2FuIGNhdXNlCisgICAgICAgIHJlLWVu dHJhbmNlIGNyYXNoZXMgaW4gV2ViQ29yZS4gVGhpcyBwYXRjaCB1c2VzIGEgdGltZXIgdG8gZG8g c28sCisgICAgICAgIGFsc28gZ2l2aW5nIHNvbWUgdGltZSB0byBzdWJzZXF1ZW50IGZyYW1lcyB0 byBmaW5pc2ggbG9hZGluZy4KKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvdXJsbG9hZGVyLmNw cDoKKyAgICAgICAgKFVybExvYWRlcjo6VXJsTG9hZGVyKToKKyAgICAgICAgKFVybExvYWRlcjo6 bG9hZE5leHQpOgorICAgICAgICAoVXJsTG9hZGVyOjpjaGVja0lmRmluaXNoZWQpOgorICAgICAg ICAoVXJsTG9hZGVyOjpmcmFtZUxvYWRTdGFydGVkKToKKyAgICAgICAgKFVybExvYWRlcjo6ZnJh bWVMb2FkRmluaXNoZWQpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvdXJsbG9hZGVyLmg6CisK IDIwMTAtMTAtMTggIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdFRlc3RC cm93c2VyL3VybGxvYWRlci5jcHAgYi9XZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL3VybGxvYWRl ci5jcHAKaW5kZXggYWJlOTkwMjgzZWZkMDBjMzE4ZjJmZDAxY2U3NmE1NDdiYjRhMTY2Yy4uOWE2 MzdjNTFhYmQ1NGY4OGI4ZDljMzE3MDc1ZjdmNzdjNGViMDYwNSAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvUXRUZXN0QnJvd3Nlci91cmxsb2FkZXIuY3BwCisrKyBiL1dlYktpdFRvb2xzL1F0VGVz dEJyb3dzZXIvdXJsbG9hZGVyLmNwcApAQCAtMzAsMTIgKzMwLDIxIEBACiAKICNpbmNsdWRlIDxR RmlsZT4KICNpbmNsdWRlIDxRRGVidWc+CisjaW5jbHVkZSA8UVdlYlBhZ2U+CiAKIFVybExvYWRl cjo6VXJsTG9hZGVyKFFXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFFTdHJpbmcmIGlucHV0RmlsZU5h bWUsIGludCB0aW1lb3V0U2Vjb25kcywgaW50IGV4dHJhVGltZVNlY29uZHMpCiAgICAgOiBtX2Zy YW1lKGZyYW1lKQogICAgICwgbV9zdGRPdXQoc3Rkb3V0KQogICAgICwgbV9sb2FkZWQoMCkKKyAg ICAsIG1fbnVtRnJhbWVzTG9hZGluZygwKQogeworICAgIG1fY2hlY2tJZkZpbmlzaGVkVGltZXIu c2V0SW50ZXJ2YWwoMjAwKTsKKyAgICBtX2NoZWNrSWZGaW5pc2hlZFRpbWVyLnNldFNpbmdsZVNo b3QodHJ1ZSk7CisgICAgY29ubmVjdCgmbV9jaGVja0lmRmluaXNoZWRUaW1lciwgU0lHTkFMKHRp bWVvdXQoKSksIHRoaXMsIFNMT1QoY2hlY2tJZkZpbmlzaGVkKCkpKTsKKyAgICAvLyBsb2FkU3Rh cnRlZCBhbmQgbG9hZEZpbmlzaGVkIG9uIFFXZWJQYWdlIGlzIGVtaXR0ZWQgZm9yIGVhY2ggZnJh bWUvc3ViLWZyYW1lCisgICAgY29ubmVjdChtX2ZyYW1lLT5wYWdlKCksIFNJR05BTChsb2FkU3Rh cnRlZCgpKSwgdGhpcywgU0xPVChmcmFtZUxvYWRTdGFydGVkKCkpKTsKKyAgICBjb25uZWN0KG1f ZnJhbWUtPnBhZ2UoKSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSksIHRoaXMsIFNMT1QoZnJh bWVMb2FkRmluaXNoZWQoKSkpOworCiAgICAgaWYgKHRpbWVvdXRTZWNvbmRzKSB7CiAgICAgICAg IG1fdGltZW91dFRpbWVyLnNldEludGVydmFsKHRpbWVvdXRTZWNvbmRzICogMTAwMCk7CiAgICAg ICAgIG1fdGltZW91dFRpbWVyLnNldFNpbmdsZVNob3QodHJ1ZSk7CkBAIC00NSwxMCArNTQsMTAg QEAgVXJsTG9hZGVyOjpVcmxMb2FkZXIoUVdlYkZyYW1lKiBmcmFtZSwgY29uc3QgUVN0cmluZyYg aW5wdXRGaWxlTmFtZSwgaW50IHRpbWVvdXQKICAgICBpZiAoZXh0cmFUaW1lU2Vjb25kcykgewog ICAgICAgICBtX2V4dHJhVGltZVRpbWVyLnNldEludGVydmFsKGV4dHJhVGltZVNlY29uZHMgKiAx MDAwKTsKICAgICAgICAgbV9leHRyYVRpbWVUaW1lci5zZXRTaW5nbGVTaG90KHRydWUpOwotICAg ICAgICBjb25uZWN0KGZyYW1lLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSwgJm1fZXh0cmFU aW1lVGltZXIsIFNMT1Qoc3RhcnQoKSkpOworICAgICAgICBjb25uZWN0KHRoaXMsIFNJR05BTChw YWdlTG9hZEZpbmlzaGVkKCkpLCAmbV9leHRyYVRpbWVUaW1lciwgU0xPVChzdGFydCgpKSk7CiAg ICAgICAgIGNvbm5lY3QoJm1fZXh0cmFUaW1lVGltZXIsIFNJR05BTCh0aW1lb3V0KCkpLCB0aGlz LCBTTE9UKGxvYWROZXh0KCkpKTsKICAgICB9IGVsc2UKLSAgICAgICAgY29ubmVjdChmcmFtZSwg U0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSksIHRoaXMsIFNMT1QobG9hZE5leHQoKSkpOworICAg ICAgICBjb25uZWN0KHRoaXMsIFNJR05BTChwYWdlTG9hZEZpbmlzaGVkKCkpLCB0aGlzLCBTTE9U KGxvYWROZXh0KCkpKTsKICAgICBsb2FkVXJsTGlzdChpbnB1dEZpbGVOYW1lKTsKIH0KIApAQCAt NTYsNiArNjUsOCBAQCB2b2lkIFVybExvYWRlcjo6bG9hZE5leHQoKQogewogICAgIG1fdGltZW91 dFRpbWVyLnN0b3AoKTsKICAgICBtX2V4dHJhVGltZVRpbWVyLnN0b3AoKTsKKyAgICBtX2NoZWNr SWZGaW5pc2hlZFRpbWVyLnN0b3AoKTsKKyAgICBtX251bUZyYW1lc0xvYWRpbmcgPSAwOwogICAg IFFTdHJpbmcgcXN0cjsKICAgICBpZiAoZ2V0VXJsKHFzdHIpKSB7CiAgICAgICAgIFFVcmwgdXJs KHFzdHIsIFFVcmw6OlN0cmljdE1vZGUpOwpAQCAtNjgsNiArNzksMjcgQEAgdm9pZCBVcmxMb2Fk ZXI6OmxvYWROZXh0KCkKICAgICAgICAgZGlzY29ubmVjdChtX2ZyYW1lLCAwLCB0aGlzLCAwKTsK IH0KIAordm9pZCBVcmxMb2FkZXI6OmNoZWNrSWZGaW5pc2hlZCgpCit7CisgICAgaWYgKCFtX251 bUZyYW1lc0xvYWRpbmcpCisgICAgICAgIGVtaXQgcGFnZUxvYWRGaW5pc2hlZCgpOworfQorCit2 b2lkIFVybExvYWRlcjo6ZnJhbWVMb2FkU3RhcnRlZCgpCit7CisgICAgKyttX251bUZyYW1lc0xv YWRpbmc7CisgICAgbV9jaGVja0lmRmluaXNoZWRUaW1lci5zdG9wKCk7Cit9CisKK3ZvaWQgVXJs TG9hZGVyOjpmcmFtZUxvYWRGaW5pc2hlZCgpCit7CisgICAgQVNTRVJUKG1fbnVtRnJhbWVzTG9h ZGluZyA+IDApOworICAgIC0tbV9udW1GcmFtZXNMb2FkaW5nOworICAgIC8vIE9uY2Ugb3VyIGZy YW1lIGhhcyBmaW5pc2hlZCBsb2FkaW5nLCB3YWl0IGEgbW9tZW50IHRvIGNhbGwgbG9hZE5leHQg Zm9yIGNhc2VzCisgICAgLy8gd2hlcmUgYSBzdWItZnJhbWUgc3RhcnRzIGxvYWRpbmcgb3IgYW5v dGhlciBmcmFtZSBpcyBsb2FkZWQgdGhyb3VnaCBKYXZhU2NyaXB0LgorICAgIG1fY2hlY2tJZkZp bmlzaGVkVGltZXIuc3RhcnQoKTsKK30KKwogdm9pZCBVcmxMb2FkZXI6OmxvYWRVcmxMaXN0KGNv bnN0IFFTdHJpbmcmIGlucHV0RmlsZU5hbWUpCiB7CiAgICAgUUZpbGUgaW5wdXRGaWxlKGlucHV0 RmlsZU5hbWUpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci91cmxsb2Fk ZXIuaCBiL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvdXJsbG9hZGVyLmgKaW5kZXggZTJhNmQ4 NzFlOTViODMyZTU0NzE5NDUwNTNkZTZkYmZhZjliNDY4Ni4uOGNlMjRjMGQwMzM3N2FiZjZlY2Rl ZTVmOGY2YTU3Y2QxZjNlOGYwMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nl ci91cmxsb2FkZXIuaAorKysgYi9XZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL3VybGxvYWRlci5o CkBAIC00NCw2ICs0NCwxNCBAQCBwdWJsaWM6CiBwdWJsaWMgc2xvdHM6CiAgICAgdm9pZCBsb2Fk TmV4dCgpOwogCitwcml2YXRlIHNsb3RzOgorICAgIHZvaWQgY2hlY2tJZkZpbmlzaGVkKCk7Cisg ICAgdm9pZCBmcmFtZUxvYWRTdGFydGVkKCk7CisgICAgdm9pZCBmcmFtZUxvYWRGaW5pc2hlZCgp OworCitzaWduYWxzOgorICAgIHZvaWQgcGFnZUxvYWRGaW5pc2hlZCgpOworCiBwcml2YXRlOgog ICAgIHZvaWQgbG9hZFVybExpc3QoY29uc3QgUVN0cmluZyYgaW5wdXRGaWxlTmFtZSk7CiAgICAg Ym9vbCBnZXRVcmwoUVN0cmluZyYgcXN0cik7CkBAIC01Niw2ICs2NCw4IEBAIHByaXZhdGU6CiAg ICAgaW50IG1fbG9hZGVkOwogICAgIFFUaW1lciBtX3RpbWVvdXRUaW1lcjsKICAgICBRVGltZXIg bV9leHRyYVRpbWVUaW1lcjsKKyAgICBRVGltZXIgbV9jaGVja0lmRmluaXNoZWRUaW1lcjsKKyAg ICBpbnQgbV9udW1GcmFtZXNMb2FkaW5nOwogfTsKIAogI2VuZGlmCg==