79897 2012-02-29 01:58:03 -0800 [BlackBerry] Web Notification crashes the browser. 2012-03-01 17:57:16 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Other Other RESOLVED FIXED P2 Major --- 0 charles.wei webkit-unassigned abarth dglazkov leo.yang rwlbuis staikos tonikitoo webkit.review.bot oldest_to_newest 567518 0 charles.wei 2012-02-29 01:58:03 -0800 Web Notification crashes the browser at permission dialog and after click on the notification. Internal PR: 140936 567543 1 129426 charles.wei 2012-02-29 02:56:12 -0800 Created attachment 129426 Patch which is internally reviewed by Robin Qiu. Internally reviewed and approved by Roin Qiu. 567644 2 129426 tonikitoo 2012-02-29 08:40:59 -0800 Comment on attachment 129426 Patch which is internally reviewed by Robin Qiu. View in context: https://bugs.webkit.org/attachment.cgi?id=129426&action=review > Source/WebKit/blackberry/ChangeLog:11 > + [BlackBerry] Web Notification crashes the browser. > + https://bugs.webkit.org/show_bug.cgi?id=79897 > + > + Reviewed by NOBODY (OOPS!). > + > + * WebCoreSupport/NotificationPresenterImpl.cpp: > + (WebKit::NotificationPresenterImpl::onPermission): > + (WebKit::NotificationPresenterImpl::notificationClicked): > + mind to explain what your patch does, how it fixes the crash, what was the cause, how to test, etc? 568233 3 129615 charles.wei 2012-02-29 19:31:36 -0800 Created attachment 129615 patch-v2 with more info about the patch 568324 4 129615 webkit.review.bot 2012-02-29 21:39:28 -0800 Comment on attachment 129615 patch-v2 with more info about the patch Attachment 129615 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11769184 New failing tests: fast/workers/storage/use-same-database-in-page-and-workers.html 568326 5 leo.yang 2012-02-29 21:43:57 -0800 (In reply to comment #4) > (From update of attachment 129615 [details]) > Attachment 129615 [details] did not pass chromium-ews (chromium-xvfb): > Output: http://queues.webkit.org/results/11769184 > > New failing tests: > fast/workers/storage/use-same-database-in-page-and-workers.html Seems not related to this patch. Letting cq try again. 568527 6 129615 webkit.review.bot 2012-03-01 03:39:05 -0800 Comment on attachment 129615 patch-v2 with more info about the patch Rejecting attachment 129615 from commit-queue. New failing tests: fast/workers/storage/use-same-database-in-page-and-workers.html Full output: http://queues.webkit.org/results/11751349 568578 7 129615 webkit.review.bot 2012-03-01 05:20:21 -0800 Comment on attachment 129615 patch-v2 with more info about the patch Rejecting attachment 129615 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/11766448 568630 8 129615 webkit.review.bot 2012-03-01 06:43:38 -0800 Comment on attachment 129615 patch-v2 with more info about the patch Rejecting attachment 129615 from commit-queue. New failing tests: fast/workers/storage/use-same-database-in-page-and-workers.html Full output: http://queues.webkit.org/results/11751427 569095 9 129615 webkit.review.bot 2012-03-01 17:27:50 -0800 Comment on attachment 129615 patch-v2 with more info about the patch Rejecting attachment 129615 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: FLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Remove last ENABLED(INDEXED_DATABASE) ifdef from WebCore proper When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/11776690 569115 10 129615 abarth 2012-03-01 17:57:10 -0800 Comment on attachment 129615 patch-v2 with more info about the patch Clearing flags on attachment: 129615 Committed r109475: <http://trac.webkit.org/changeset/109475> 569116 11 abarth 2012-03-01 17:57:16 -0800 All reviewed patches have been landed. Closing bug. 129426 2012-02-29 02:56:12 -0800 2012-02-29 19:31:36 -0800 Patch which is internally reviewed by Robin Qiu. 0001-BlackBerry-Web-Notification-crashes-the-browser.patch text/plain 3330 charles.wei RnJvbSA5ZTJlYmU5NmJmNzMwYzEwNWY2ZjJmMjExYzIzNDAzNjBhMGZhYjViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDaGFybGVzIFdlaSA8Y2hhcmxlcy53ZWlAdG9yY2htb2JpbGUu Y29tLmNuPgpEYXRlOiBXZWQsIDI5IEZlYiAyMDEyIDE4OjU2OjAzICswODAwClN1YmplY3Q6IFtQ QVRDSF0gW0JsYWNrQmVycnldIFdlYiBOb3RpZmljYXRpb24gY3Jhc2hlcyB0aGUgYnJvd3Nlci4K IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTg5NwoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgoqIFdlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRl ckltcGwuY3BwOgooV2ViS2l0OjpOb3RpZmljYXRpb25QcmVzZW50ZXJJbXBsOjpvblBlcm1pc3Np b24pOgooV2ViS2l0OjpOb3RpZmljYXRpb25QcmVzZW50ZXJJbXBsOjpub3RpZmljYXRpb25DbGlj a2VkKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICB8ICAgMTEgKysrKysrKysrKysKIC4uLi9XZWJDb3JlU3VwcG9ydC9Ob3RpZmljYXRpb25Q cmVzZW50ZXJJbXBsLmNwcCAgIHwgICAxMiArKysrKysrLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwg MTggaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5n ZUxvZwppbmRleCAwMDllMjk1Li5iMDM2M2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0wMi0yOSAgQ2hhcmxlcyBXZWkgIDxjaGFybGVzLndl aUB0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFdlYiBOb3RpZmlj YXRpb24gY3Jhc2hlcyB0aGUgYnJvd3Nlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc5ODk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Tm90aWZpY2F0aW9uUHJlc2VudGVySW1wbDo6b25Q ZXJtaXNzaW9uKToKKyAgICAgICAgKFdlYktpdDo6Tm90aWZpY2F0aW9uUHJlc2VudGVySW1wbDo6 bm90aWZpY2F0aW9uQ2xpY2tlZCk6CisKIDIwMTItMDItMjYgIEhhamltZSBNb3JyaXRhICA8bW9y cml0YUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTW92ZSBDaHJvbWVDbGllbnQ6OnNob3dDb250 ZXh0TWVudSgpIHRvIENvbnRleHRNZW51Q2xpZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJl c2VudGVySW1wbC5jcHAKaW5kZXggNTA1YjE4MC4uMDc2ZmI1OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlcklt cGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9Ob3Rp ZmljYXRpb25QcmVzZW50ZXJJbXBsLmNwcApAQCAtMTA4LDEwICsxMDgsMTAgQEAgdm9pZCBOb3Rp ZmljYXRpb25QcmVzZW50ZXJJbXBsOjpvblBlcm1pc3Npb24oY29uc3Qgc3RkOjpzdHJpbmcmIGRv bWFpbiwgYm9vbCBpc0EKICAgICBBU1NFUlQoIWRvbWFpbi5lbXB0eSgpKTsKICAgICBTdHJpbmcg ZG9tYWluU3RyaW5nID0gU3RyaW5nOjpmcm9tVVRGOChkb21haW4uY19zdHIoKSk7CiAgICAgUGVy bWlzc2lvblJlcXVlc3RNYXA6Oml0ZXJhdG9yIGl0ID0gbV9wZXJtaXNzaW9uUmVxdWVzdHMuYmVn aW4oKTsKLSAgICBQZXJtaXNzaW9uUmVxdWVzdE1hcDo6aXRlcmF0b3IgZW5kID0gbV9wZXJtaXNz aW9uUmVxdWVzdHMuZW5kKCk7Ci0gICAgZm9yICg7IGl0ICE9IGVuZDsgKytpdCkgeworICAgIGZv ciAoOyBpdCAhPSBtX3Blcm1pc3Npb25SZXF1ZXN0cy5lbmQoKTsgKytpdCkgewogICAgICAgICBp ZiAoaXQtPmZpcnN0LT51cmwoKS5ob3N0KCkgIT0gZG9tYWluU3RyaW5nKQogICAgICAgICAgICAg Y29udGludWU7CisKICAgICAgICAgaWYgKGlzQWxsb3dlZCkgewogICAgICAgICAgICAgbV9hbGxv d2VkRG9tYWlucy5hZGQoZG9tYWluU3RyaW5nKTsKICAgICAgICAgICAgIGl0LT5zZWNvbmQtPmhh bmRsZUV2ZW50KCk7CkBAIC0xMTksNiArMTE5LDcgQEAgdm9pZCBOb3RpZmljYXRpb25QcmVzZW50 ZXJJbXBsOjpvblBlcm1pc3Npb24oY29uc3Qgc3RkOjpzdHJpbmcmIGRvbWFpbiwgYm9vbCBpc0EK ICAgICAgICAgICAgIG1fYWxsb3dlZERvbWFpbnMucmVtb3ZlKGRvbWFpblN0cmluZyk7CiAKICAg ICAgICAgbV9wZXJtaXNzaW9uUmVxdWVzdHMucmVtb3ZlKGl0KTsKKyAgICAgICAgcmV0dXJuOwog ICAgIH0KIH0KIApAQCAtMTQzLDExICsxNDQsMTIgQEAgdm9pZCBOb3RpZmljYXRpb25QcmVzZW50 ZXJJbXBsOjpub3RpZmljYXRpb25DbGlja2VkKGNvbnN0IHN0ZDo6c3RyaW5nJiBpZCkKICAgICBB U1NFUlQoIWlkLmVtcHR5KCkpOwogICAgIFN0cmluZyBpZFN0cmluZyA9IFN0cmluZzo6ZnJvbVVU RjgoaWQuY19zdHIoKSk7CiAgICAgTm90aWZpY2F0aW9uTWFwOjppdGVyYXRvciBpdCA9IG1fbm90 aWZpY2F0aW9ucy5iZWdpbigpOwotICAgIE5vdGlmaWNhdGlvbk1hcDo6aXRlcmF0b3IgZW5kID0g bV9ub3RpZmljYXRpb25zLmVuZCgpOwotICAgIGZvciAoOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAg ICBmb3IgKDsgaXQgIT0gbV9ub3RpZmljYXRpb25zLmVuZCgpOyArK2l0KSB7CiAgICAgICAgIGlm IChpdC0+c2Vjb25kID09IGlkU3RyaW5nICYmIGl0LT5maXJzdC0+c2NyaXB0RXhlY3V0aW9uQ29u dGV4dCgpKSB7CisgICAgICAgICAgICBSZWZQdHI8Tm90aWZpY2F0aW9uPiBub3RpZmljYXRpb24g PSBpdC0+Zmlyc3Q7CiAgICAgICAgICAgICBpdC0+Zmlyc3QtPmRpc3BhdGNoRXZlbnQoRXZlbnQ6 OmNyZWF0ZShldmVudE5hbWVzKCkuY2xpY2tFdmVudCwgZmFsc2UsIHRydWUpKTsKLSAgICAgICAg ICAgIG1fbm90aWZpY2F0aW9ucy5yZW1vdmUoaXQpOworICAgICAgICAgICAgbV9ub3RpZmljYXRp b25zLnJlbW92ZShub3RpZmljYXRpb24pOworICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAgICAgfQogfQotLSAKMS43LjkuMQoK 129615 2012-02-29 19:31:36 -0800 2012-03-01 17:57:10 -0800 patch-v2 with more info about the patch 0001-BlackBerry-Web-Notification-crashes-the-browser.patch text/plain 4250 charles.wei RnJvbSA2NWZhYWRmZmJjMTc0ODgzOGNjZjgyZTBjMjRhZmQ2YWUxMGQ4NmZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDaGFybGVzIFdlaSA8Y2hhcmxlcy53ZWlAdG9yY2htb2JpbGUu Y29tLmNuPgpEYXRlOiBUaHUsIDEgTWFyIDIwMTIgMTE6MzE6MTkgKzA4MDAKU3ViamVjdDogW1BB VENIXSBbQmxhY2tCZXJyeV0gV2ViIE5vdGlmaWNhdGlvbiBjcmFzaGVzIHRoZSBicm93c2VyLgog aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5ODk3CgpSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KClRoZSByZWFzb24gb2YgdGhlIGNyYXNoIGlzIHRoYXQgaXQgc3Rp bGwgdXNlcyB0aGUgaXRlcmF0b3IKYWZ0ZXIgYmVlbiByZW1vdmVkIGZyb20gdGhlIGNvbnRhaW5l ciwgd2hpY2ggaW52YWxpZGF0ZXMgdGhlCml0ZXJhdG9yLgpXZSBzaG91bGQgc3RvcCBwcm9jZXNz aW5nIGFmdGVyIHdlIGhhdmUgZm91bmQgdGhlIGVsZW1lbnQKYW5kIHJlbW92ZWQgZnJvbSB0aGUg Y29udGFpbmVyIHRocm91Z2ggdGhlIGl0ZXJhdG9yLgoKVGhpcyBwYXRjaCBvbmx5IGZpeGVzIHRo ZSBjcmFzaCBpc3N1ZSwgYnV0IG5vdCBhbnkgbm90aWZpY2F0aW9uCmZ1bmN0aW9uYWxpdHkgaXNz dWUsIHdoaWNoIGlzIHRyYWNrZWQgc2VwZXJhdGx5LgoKVGVzdCBjYXNlOiBodHRwOi8vc2FuZGJv eC5ndGFlcm8ubmV0L2Nocm9tZS9ub3RpZmljYXRpb25zLnBocAoKKiBXZWJDb3JlU3VwcG9ydC9O b3RpZmljYXRpb25QcmVzZW50ZXJJbXBsLmNwcDoKKFdlYktpdDo6Tm90aWZpY2F0aW9uUHJlc2Vu dGVySW1wbDo6b25QZXJtaXNzaW9uKToKKFdlYktpdDo6Tm90aWZpY2F0aW9uUHJlc2VudGVySW1w bDo6bm90aWZpY2F0aW9uQ2xpY2tlZCk6Ci0tLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0No YW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDIyICsrKysrKysrKysrKysrKysrKysrCiAuLi4v V2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJlc2VudGVySW1wbC5jcHAgICB8ICAgMTIgKysr KysrLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDAwOWUyOTUuLjI5MTY4NDUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAyLTI5 ICBDaGFybGVzIFdlaSAgPGNoYXJsZXMud2VpQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAg ICBbQmxhY2tCZXJyeV0gV2ViIE5vdGlmaWNhdGlvbiBjcmFzaGVzIHRoZSBicm93c2VyLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk4OTcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcmVhc29uIG9m IHRoZSBjcmFzaCBpcyB0aGF0IGl0IHN0aWxsIHVzZXMgdGhlIGl0ZXJhdG9yCisgICAgICAgIGFm dGVyIGJlZW4gcmVtb3ZlZCBmcm9tIHRoZSBjb250YWluZXIsIHdoaWNoIGludmFsaWRhdGVzIHRo ZQorICAgICAgICBpdGVyYXRvci4gCisgICAgICAgIFdlIHNob3VsZCBzdG9wIHByb2Nlc3Npbmcg YWZ0ZXIgd2UgaGF2ZSBmb3VuZCB0aGUgZWxlbWVudAorICAgICAgICBhbmQgcmVtb3ZlZCBmcm9t IHRoZSBjb250YWluZXIgdGhyb3VnaCB0aGUgaXRlcmF0b3IuCisKKyAgICAgICAgVGhpcyBwYXRj aCBvbmx5IGZpeGVzIHRoZSBjcmFzaCBpc3N1ZSwgYnV0IG5vdCBhbnkgbm90aWZpY2F0aW9uCisg ICAgICAgIGZ1bmN0aW9uYWxpdHkgaXNzdWUsIHdoaWNoIGlzIHRyYWNrZWQgc2VwZXJhdGx5Lgor CisgICAgICAgIFRlc3QgY2FzZTogaHR0cDovL3NhbmRib3guZ3RhZXJvLm5ldC9jaHJvbWUvbm90 aWZpY2F0aW9ucy5waHAKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblBy ZXNlbnRlckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpOb3RpZmljYXRpb25QcmVzZW50ZXJJ bXBsOjpvblBlcm1pc3Npb24pOgorICAgICAgICAoV2ViS2l0OjpOb3RpZmljYXRpb25QcmVzZW50 ZXJJbXBsOjpub3RpZmljYXRpb25DbGlja2VkKToKKwogMjAxMi0wMi0yNiAgSGFqaW1lIE1vcnJp dGEgIDxtb3JyaXRhQGNocm9taXVtLm9yZz4KIAogICAgICAgICBNb3ZlIENocm9tZUNsaWVudDo6 c2hvd0NvbnRleHRNZW51KCkgdG8gQ29udGV4dE1lbnVDbGllbnQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJJ bXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9Ob3RpZmlj YXRpb25QcmVzZW50ZXJJbXBsLmNwcAppbmRleCA1MDViMTgwLi4wNzZmYjU5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJl c2VudGVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBw b3J0L05vdGlmaWNhdGlvblByZXNlbnRlckltcGwuY3BwCkBAIC0xMDgsMTAgKzEwOCwxMCBAQCB2 b2lkIE5vdGlmaWNhdGlvblByZXNlbnRlckltcGw6Om9uUGVybWlzc2lvbihjb25zdCBzdGQ6OnN0 cmluZyYgZG9tYWluLCBib29sIGlzQQogICAgIEFTU0VSVCghZG9tYWluLmVtcHR5KCkpOwogICAg IFN0cmluZyBkb21haW5TdHJpbmcgPSBTdHJpbmc6OmZyb21VVEY4KGRvbWFpbi5jX3N0cigpKTsK ICAgICBQZXJtaXNzaW9uUmVxdWVzdE1hcDo6aXRlcmF0b3IgaXQgPSBtX3Blcm1pc3Npb25SZXF1 ZXN0cy5iZWdpbigpOwotICAgIFBlcm1pc3Npb25SZXF1ZXN0TWFwOjppdGVyYXRvciBlbmQgPSBt X3Blcm1pc3Npb25SZXF1ZXN0cy5lbmQoKTsKLSAgICBmb3IgKDsgaXQgIT0gZW5kOyArK2l0KSB7 CisgICAgZm9yICg7IGl0ICE9IG1fcGVybWlzc2lvblJlcXVlc3RzLmVuZCgpOyArK2l0KSB7CiAg ICAgICAgIGlmIChpdC0+Zmlyc3QtPnVybCgpLmhvc3QoKSAhPSBkb21haW5TdHJpbmcpCiAgICAg ICAgICAgICBjb250aW51ZTsKKwogICAgICAgICBpZiAoaXNBbGxvd2VkKSB7CiAgICAgICAgICAg ICBtX2FsbG93ZWREb21haW5zLmFkZChkb21haW5TdHJpbmcpOwogICAgICAgICAgICAgaXQtPnNl Y29uZC0+aGFuZGxlRXZlbnQoKTsKQEAgLTExOSw2ICsxMTksNyBAQCB2b2lkIE5vdGlmaWNhdGlv blByZXNlbnRlckltcGw6Om9uUGVybWlzc2lvbihjb25zdCBzdGQ6OnN0cmluZyYgZG9tYWluLCBi b29sIGlzQQogICAgICAgICAgICAgbV9hbGxvd2VkRG9tYWlucy5yZW1vdmUoZG9tYWluU3RyaW5n KTsKIAogICAgICAgICBtX3Blcm1pc3Npb25SZXF1ZXN0cy5yZW1vdmUoaXQpOworICAgICAgICBy ZXR1cm47CiAgICAgfQogfQogCkBAIC0xNDMsMTEgKzE0NCwxMiBAQCB2b2lkIE5vdGlmaWNhdGlv blByZXNlbnRlckltcGw6Om5vdGlmaWNhdGlvbkNsaWNrZWQoY29uc3Qgc3RkOjpzdHJpbmcmIGlk KQogICAgIEFTU0VSVCghaWQuZW1wdHkoKSk7CiAgICAgU3RyaW5nIGlkU3RyaW5nID0gU3RyaW5n Ojpmcm9tVVRGOChpZC5jX3N0cigpKTsKICAgICBOb3RpZmljYXRpb25NYXA6Oml0ZXJhdG9yIGl0 ID0gbV9ub3RpZmljYXRpb25zLmJlZ2luKCk7Ci0gICAgTm90aWZpY2F0aW9uTWFwOjppdGVyYXRv ciBlbmQgPSBtX25vdGlmaWNhdGlvbnMuZW5kKCk7Ci0gICAgZm9yICg7IGl0ICE9IGVuZDsgKytp dCkgeworICAgIGZvciAoOyBpdCAhPSBtX25vdGlmaWNhdGlvbnMuZW5kKCk7ICsraXQpIHsKICAg ICAgICAgaWYgKGl0LT5zZWNvbmQgPT0gaWRTdHJpbmcgJiYgaXQtPmZpcnN0LT5zY3JpcHRFeGVj dXRpb25Db250ZXh0KCkpIHsKKyAgICAgICAgICAgIFJlZlB0cjxOb3RpZmljYXRpb24+IG5vdGlm aWNhdGlvbiA9IGl0LT5maXJzdDsKICAgICAgICAgICAgIGl0LT5maXJzdC0+ZGlzcGF0Y2hFdmVu dChFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50LCBmYWxzZSwgdHJ1ZSkpOwot ICAgICAgICAgICAgbV9ub3RpZmljYXRpb25zLnJlbW92ZShpdCk7CisgICAgICAgICAgICBtX25v dGlmaWNhdGlvbnMucmVtb3ZlKG5vdGlmaWNhdGlvbik7CisgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KICAgICB9CiB9Ci0tIAoxLjcuOS4xCgo=