41864 2010-07-08 09:19:53 -0700 [V8] Navigation policy doesn't play nicely with pepper plugins 2010-07-08 16:59:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth fishd jam oldest_to_newest 248258 0 abarth 2010-07-08 09:19:53 -0700 [V8] Navigation policy doesn't play nicely with pepper plugins 248260 1 60898 abarth 2010-07-08 09:21:54 -0700 Created attachment 60898 Patch 248346 2 60913 jam 2010-07-08 11:05:08 -0700 Created attachment 60913 Updated patch 248417 3 60913 abarth 2010-07-08 12:14:40 -0700 Comment on attachment 60913 Updated patch This patch does not have a ChangeLog. V8Utilities:103 + Frame* callingFrameForNavigation() { This isn't the right name for this function. The calling frame isn't changing because we're interested in navigation. Maybe the name "activeFrameForNavigation" is better? It's really the same thing we do for the canAccess check, so it might be worth sharing there too. Maybe principalFrame (to steal some terminology from Mozilla)? 248445 4 fishd 2010-07-08 12:48:22 -0700 I was struggling to suggest a name too. I like principalFrame since it helps specify how we intend to use the frame. 248447 5 fishd 2010-07-08 12:49:15 -0700 Another choice is callingOrEnteredFrame. It seems common in WebKit to use function names like that. It doesn't add any new terms to understand and just states what the function does. 248467 6 60937 jam 2010-07-08 13:03:20 -0700 Created attachment 60937 Patch 248470 7 jam 2010-07-08 13:03:59 -0700 callingOrEnteredFrame sounds good to me. 248584 8 60937 abarth 2010-07-08 15:19:51 -0700 Comment on attachment 60937 Patch - if (!callingFrame) - return; You removed this null check. Retrieving the frame can fail if the entered context is associated with an inactive document. In that case, this patch introduces a crash. 248585 9 60937 abarth 2010-07-08 15:20:20 -0700 Comment on attachment 60937 Patch WebCore/bindings/v8/V8Utilities.cpp:119 + Frame* callingFrame = callingOrEnteredFrame(); Also, "callingFrame" is not an accurate name anymore. 248600 10 60975 jam 2010-07-08 15:53:41 -0700 Created attachment 60975 Patch 248622 11 abarth 2010-07-08 16:28:32 -0700 Thanks John. 248632 12 60975 abarth 2010-07-08 16:42:46 -0700 Comment on attachment 60975 Patch This will actually fail to land in the commit-queue because the ChangeLog says OOPS. I can land it manually for John. 248635 13 jam 2010-07-08 16:43:55 -0700 Thanks for the initial pointer and review. I can take care of landing it. 248640 14 jam 2010-07-08 16:59:52 -0700 Committed r62868: <http://trac.webkit.org/changeset/62868> 60898 2010-07-08 09:21:54 -0700 2010-07-08 11:05:08 -0700 Patch bug-41864-20100708092152.patch text/plain 1711 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Mjc5MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDctMDggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbVjhd IE5hdmlnYXRpb24gcG9saWN5IGRvZXNuJ3QgcGxheSBuaWNlbHkgd2l0aCBwZXBwZXIgcGx1Z2lu cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE4NjQK KworICAgICAgICBTYW1wbGUgcGF0Y2guICBTdGlsbCBuZWVkcyBhIHRlc3QuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFV0aWxpdGll cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRBbGxvd05hdmlnYXRpb24pOgorCiAyMDEw LTA3LTA4ICBWaXRhbHkgUmVwZXNoa28gIDx2aXRhbHlyQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9W OFV0aWxpdGllcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0aWxp dGllcy5jcHAJKHJldmlzaW9uIDYyNzkxKQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0aWxp dGllcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw4ICsxMDIsMTYgQEAgYm9vbCBwcm9jZXNz aW5nVXNlckdlc3R1cmUoKQogCiBib29sIHNob3VsZEFsbG93TmF2aWdhdGlvbihGcmFtZSogZnJh bWUpCiB7Ci0gICAgRnJhbWUqIGNhbGxpbmdGcmFtZSA9IFY4UHJveHk6OnJldHJpZXZlRnJhbWVG b3JDYWxsaW5nQ29udGV4dCgpOwotICAgIHJldHVybiBjYWxsaW5nRnJhbWUgJiYgY2FsbGluZ0Zy YW1lLT5sb2FkZXIoKS0+c2hvdWxkQWxsb3dOYXZpZ2F0aW9uKGZyYW1lKTsKKyAgICBGcmFtZSog ZnJhbWUgPSBWOFByb3h5OjpyZXRyaWV2ZUZyYW1lRm9yQ2FsbGluZ0NvbnRleHQoKTsKKyAgICBp ZiAoIWZyYW1lKSB7CisgICAgICAgIC8vIFVuZm9ydHVuYXRlbHksIHdoZW4gcHJvY2Vzc2luZyBz Y3JpcHQgZnJvbSBhIHBsdWctaW4sIHdlIG1pZ2h0IG5vdAorICAgICAgICAvLyBoYXZlIGEgY2Fs bGluZyBjb250ZXh0LiAgSW4gdGhvc2UgY2FzZXMsIHdlIGZhbGwgYmFjayB0byB0aGUKKyAgICAg ICAgLy8gZW50ZXJlZCBjb250ZXh0IGZvciBzZWN1cml0eSBjaGVja3MuCisgICAgICAgIC8vIEZJ WE1FOiBXZSBuZWVkIGEgYmV0dGVyIEFQSSBmb3IgcmV0cmlldmluZyBmcmFtZXMgdGhhdCBhYnN0 cmFjdHMKKyAgICAgICAgLy8gICAgICAgIGF3YXkgdGhpcyBjb25jZXJuLgorICAgICAgICBmcmFt ZSA9IFY4UHJveHk6OnJldHJpZXZlRnJhbWVGb3JFbnRlcmVkQ29udGV4dCgpOworICAgIH0KKyAg ICByZXR1cm4gZnJhbWUgJiYgZnJhbWUtPmxvYWRlcigpLT5zaG91bGRBbGxvd05hdmlnYXRpb24o ZnJhbWUpOwogfQogCiBLVVJMIGNvbXBsZXRlVVJMKGNvbnN0IFN0cmluZyYgcmVsYXRpdmVVUkwp Cg== 60913 2010-07-08 11:05:08 -0700 2010-07-08 13:03:16 -0700 Updated patch navpatch.diff text/plain 1618 jam SW5kZXg6IFY4VXRpbGl0aWVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBWOFV0aWxpdGllcy5jcHAJKHJl dmlzaW9uIDYyODAyKQorKysgVjhVdGlsaXRpZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAs OSArMTAwLDIyIEBACiAgICAgcmV0dXJuIGZyYW1lICYmIGZyYW1lLT5zY3JpcHQoKS0+cHJvY2Vz c2luZ1VzZXJHZXN0dXJlKCk7CiB9CiAKK0ZyYW1lKiBjYWxsaW5nRnJhbWVGb3JOYXZpZ2F0aW9u KCkgeworICAgIEZyYW1lKiBjYWxsaW5nRnJhbWUgPSBWOFByb3h5OjpyZXRyaWV2ZUZyYW1lRm9y Q2FsbGluZ0NvbnRleHQoKTsKKyAgICBpZiAoIWNhbGxpbmdGcmFtZSkgeworICAgICAgICAvLyBV bmZvcnR1bmF0ZWx5LCB3aGVuIHByb2Nlc3Npbmcgc2NyaXB0IGZyb20gYSBwbHVnLWluLCB3ZSBt aWdodCBub3QKKyAgICAgICAgLy8gaGF2ZSBhIGNhbGxpbmcgY29udGV4dC4gIEluIHRob3NlIGNh c2VzLCB3ZSBmYWxsIGJhY2sgdG8gdGhlCisgICAgICAgIC8vIGVudGVyZWQgY29udGV4dCBmb3Ig c2VjdXJpdHkgY2hlY2tzLgorICAgICAgICAvLyBGSVhNRTogV2UgbmVlZCBhIGJldHRlciBBUEkg Zm9yIHJldHJpZXZpbmcgZnJhbWVzIHRoYXQgYWJzdHJhY3RzCisgICAgICAgIC8vICAgICAgICBh d2F5IHRoaXMgY29uY2Vybi4KKyAgICAgICAgY2FsbGluZ0ZyYW1lID0gVjhQcm94eTo6cmV0cmll dmVGcmFtZUZvckVudGVyZWRDb250ZXh0KCk7CisgICAgfQorICAgIHJldHVybiBjYWxsaW5nRnJh bWU7Cit9CisKIGJvb2wgc2hvdWxkQWxsb3dOYXZpZ2F0aW9uKEZyYW1lKiBmcmFtZSkKIHsKLSAg ICBGcmFtZSogY2FsbGluZ0ZyYW1lID0gVjhQcm94eTo6cmV0cmlldmVGcmFtZUZvckNhbGxpbmdD b250ZXh0KCk7CisgICAgRnJhbWUqIGNhbGxpbmdGcmFtZSA9IGNhbGxpbmdGcmFtZUZvck5hdmln YXRpb24oKTsKICAgICByZXR1cm4gY2FsbGluZ0ZyYW1lICYmIGNhbGxpbmdGcmFtZS0+bG9hZGVy KCktPnNob3VsZEFsbG93TmF2aWdhdGlvbihmcmFtZSk7CiB9CiAKQEAgLTExNywxMCArMTMwLDcg QEAKIAogdm9pZCBuYXZpZ2F0ZUlmQWxsb3dlZChGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVy bCwgYm9vbCBsb2NrSGlzdG9yeSwgYm9vbCBsb2NrQmFja0ZvcndhcmRMaXN0KQogewotICAgIEZy YW1lKiBjYWxsaW5nRnJhbWUgPSBWOFByb3h5OjpyZXRyaWV2ZUZyYW1lRm9yQ2FsbGluZ0NvbnRl eHQoKTsKLSAgICBpZiAoIWNhbGxpbmdGcmFtZSkKLSAgICAgICAgcmV0dXJuOwotCisgICAgRnJh bWUqIGNhbGxpbmdGcmFtZSA9IGNhbGxpbmdGcmFtZUZvck5hdmlnYXRpb24oKTsKICAgICBpZiAo IXByb3RvY29sSXNKYXZhU2NyaXB0KHVybCkgfHwgU2NyaXB0Q29udHJvbGxlcjo6aXNTYWZlU2Ny aXB0KGZyYW1lKSkKICAgICAgICAgZnJhbWUtPnJlZGlyZWN0U2NoZWR1bGVyKCktPnNjaGVkdWxl TG9jYXRpb25DaGFuZ2UodXJsLnN0cmluZygpLCBjYWxsaW5nRnJhbWUtPmxvYWRlcigpLT5vdXRn b2luZ1JlZmVycmVyKCksIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0LCBwcm9jZXNz aW5nVXNlckdlc3R1cmUoKSk7CiB9Cg== 60937 2010-07-08 13:03:20 -0700 2010-07-08 15:53:38 -0700 Patch bug-41864-20100708130247.patch text/plain 2406 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MjgyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDctMDggIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBbVjhdIE5hdmlnYXRpb24gcG9saWN5IGRvZXNuJ3QgcGxheSBuaWNlbHkgd2l0aCBwZXBwZXIg cGx1Z2lucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDE4NjQKKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIGJpbmRp bmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNhbGxpbmdPckVudGVy ZWRGcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRBbGxvd05hdmlnYXRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6bmF2aWdhdGVJZkFsbG93ZWQpOgorCiAyMDEwLTA3LTA4ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERh biBCZXJuc3RlaW4uCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAkocmV2aXNp b24gNjI4MDIpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTAwLDkgKzEwMCwyMyBAQCBib29sIHByb2Nlc3NpbmdVc2VyR2VzdHVyZSgp CiAgICAgcmV0dXJuIGZyYW1lICYmIGZyYW1lLT5zY3JpcHQoKS0+cHJvY2Vzc2luZ1VzZXJHZXN0 dXJlKCk7CiB9CiAKLWJvb2wgc2hvdWxkQWxsb3dOYXZpZ2F0aW9uKEZyYW1lKiBmcmFtZSkKK0Zy YW1lKiBjYWxsaW5nT3JFbnRlcmVkRnJhbWUoKQogewogICAgIEZyYW1lKiBjYWxsaW5nRnJhbWUg PSBWOFByb3h5OjpyZXRyaWV2ZUZyYW1lRm9yQ2FsbGluZ0NvbnRleHQoKTsKKyAgICBpZiAoIWNh bGxpbmdGcmFtZSkgeworICAgICAgICAvLyBVbmZvcnR1bmF0ZWx5LCB3aGVuIHByb2Nlc3Npbmcg c2NyaXB0IGZyb20gYSBwbHVnLWluLCB3ZSBtaWdodCBub3QKKyAgICAgICAgLy8gaGF2ZSBhIGNh bGxpbmcgY29udGV4dC4gIEluIHRob3NlIGNhc2VzLCB3ZSBmYWxsIGJhY2sgdG8gdGhlCisgICAg ICAgIC8vIGVudGVyZWQgY29udGV4dCBmb3Igc2VjdXJpdHkgY2hlY2tzLgorICAgICAgICAvLyBG SVhNRTogV2UgbmVlZCBhIGJldHRlciBBUEkgZm9yIHJldHJpZXZpbmcgZnJhbWVzIHRoYXQgYWJz dHJhY3RzCisgICAgICAgIC8vICAgICAgICBhd2F5IHRoaXMgY29uY2Vybi4KKyAgICAgICAgY2Fs bGluZ0ZyYW1lID0gVjhQcm94eTo6cmV0cmlldmVGcmFtZUZvckVudGVyZWRDb250ZXh0KCk7Cisg ICAgfQorICAgIHJldHVybiBjYWxsaW5nRnJhbWU7Cit9CisKK2Jvb2wgc2hvdWxkQWxsb3dOYXZp Z2F0aW9uKEZyYW1lKiBmcmFtZSkKK3sKKyAgICBGcmFtZSogY2FsbGluZ0ZyYW1lID0gY2FsbGlu Z09yRW50ZXJlZEZyYW1lKCk7CiAgICAgcmV0dXJuIGNhbGxpbmdGcmFtZSAmJiBjYWxsaW5nRnJh bWUtPmxvYWRlcigpLT5zaG91bGRBbGxvd05hdmlnYXRpb24oZnJhbWUpOwogfQogCkBAIC0xMTcs MTAgKzEzMSw3IEBAIEtVUkwgY29tcGxldGVVUkwoY29uc3QgU3RyaW5nJiByZWxhdGl2ZVUKIAog dm9pZCBuYXZpZ2F0ZUlmQWxsb3dlZChGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCwgYm9v bCBsb2NrSGlzdG9yeSwgYm9vbCBsb2NrQmFja0ZvcndhcmRMaXN0KQogewotICAgIEZyYW1lKiBj YWxsaW5nRnJhbWUgPSBWOFByb3h5OjpyZXRyaWV2ZUZyYW1lRm9yQ2FsbGluZ0NvbnRleHQoKTsK LSAgICBpZiAoIWNhbGxpbmdGcmFtZSkKLSAgICAgICAgcmV0dXJuOwotCisgICAgRnJhbWUqIGNh bGxpbmdGcmFtZSA9IGNhbGxpbmdPckVudGVyZWRGcmFtZSgpOwogICAgIGlmICghcHJvdG9jb2xJ c0phdmFTY3JpcHQodXJsKSB8fCBTY3JpcHRDb250cm9sbGVyOjppc1NhZmVTY3JpcHQoZnJhbWUp KQogICAgICAgICBmcmFtZS0+cmVkaXJlY3RTY2hlZHVsZXIoKS0+c2NoZWR1bGVMb2NhdGlvbkNo YW5nZSh1cmwuc3RyaW5nKCksIGNhbGxpbmdGcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJy ZXIoKSwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIHByb2Nlc3NpbmdVc2VyR2Vz dHVyZSgpKTsKIH0K 60975 2010-07-08 15:53:41 -0700 2010-07-08 16:42:46 -0700 Patch bug-41864-20100708155309.patch text/plain 2816 jam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MjgyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDctMDggIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBbVjhdIE5hdmlnYXRpb24gcG9saWN5IGRvZXNuJ3QgcGxheSBuaWNlbHkgd2l0aCBwZXBwZXIg cGx1Z2lucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDE4NjQKKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIGJpbmRp bmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNhbGxpbmdPckVudGVy ZWRGcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRBbGxvd05hdmlnYXRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6bmF2aWdhdGVJZkFsbG93ZWQpOgorCiAyMDEwLTA3LTA4ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERh biBCZXJuc3RlaW4uCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAkocmV2aXNp b24gNjI4MDIpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4VXRpbGl0aWVzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTAwLDEwICsxMDAsMjQgQEAgYm9vbCBwcm9jZXNzaW5nVXNlckdlc3R1cmUo KQogICAgIHJldHVybiBmcmFtZSAmJiBmcmFtZS0+c2NyaXB0KCktPnByb2Nlc3NpbmdVc2VyR2Vz dHVyZSgpOwogfQogCitGcmFtZSogY2FsbGluZ09yRW50ZXJlZEZyYW1lKCkKK3sKKyAgICBGcmFt ZSogZnJhbWUgPSBWOFByb3h5OjpyZXRyaWV2ZUZyYW1lRm9yQ2FsbGluZ0NvbnRleHQoKTsKKyAg ICBpZiAoIWZyYW1lKSB7CisgICAgICAgIC8vIFVuZm9ydHVuYXRlbHksIHdoZW4gcHJvY2Vzc2lu ZyBzY3JpcHQgZnJvbSBhIHBsdWctaW4sIHdlIG1pZ2h0IG5vdAorICAgICAgICAvLyBoYXZlIGEg Y2FsbGluZyBjb250ZXh0LiAgSW4gdGhvc2UgY2FzZXMsIHdlIGZhbGwgYmFjayB0byB0aGUKKyAg ICAgICAgLy8gZW50ZXJlZCBjb250ZXh0IGZvciBzZWN1cml0eSBjaGVja3MuCisgICAgICAgIC8v IEZJWE1FOiBXZSBuZWVkIGEgYmV0dGVyIEFQSSBmb3IgcmV0cmlldmluZyBmcmFtZXMgdGhhdCBh YnN0cmFjdHMKKyAgICAgICAgLy8gICAgICAgIGF3YXkgdGhpcyBjb25jZXJuLgorICAgICAgICBm cmFtZSA9IFY4UHJveHk6OnJldHJpZXZlRnJhbWVGb3JFbnRlcmVkQ29udGV4dCgpOworICAgIH0K KyAgICByZXR1cm4gZnJhbWU7Cit9CisKIGJvb2wgc2hvdWxkQWxsb3dOYXZpZ2F0aW9uKEZyYW1l KiBmcmFtZSkKIHsKLSAgICBGcmFtZSogY2FsbGluZ0ZyYW1lID0gVjhQcm94eTo6cmV0cmlldmVG cmFtZUZvckNhbGxpbmdDb250ZXh0KCk7Ci0gICAgcmV0dXJuIGNhbGxpbmdGcmFtZSAmJiBjYWxs aW5nRnJhbWUtPmxvYWRlcigpLT5zaG91bGRBbGxvd05hdmlnYXRpb24oZnJhbWUpOworICAgIEZy YW1lKiBjYWxsaW5nT3JFbnRlcmVkID0gY2FsbGluZ09yRW50ZXJlZEZyYW1lKCk7CisgICAgcmV0 dXJuIGNhbGxpbmdPckVudGVyZWQgJiYgY2FsbGluZ09yRW50ZXJlZC0+bG9hZGVyKCktPnNob3Vs ZEFsbG93TmF2aWdhdGlvbihmcmFtZSk7CiB9CiAKIEtVUkwgY29tcGxldGVVUkwoY29uc3QgU3Ry aW5nJiByZWxhdGl2ZVVSTCkKQEAgLTExNywxMiArMTMxLDExIEBAIEtVUkwgY29tcGxldGVVUkwo Y29uc3QgU3RyaW5nJiByZWxhdGl2ZVUKIAogdm9pZCBuYXZpZ2F0ZUlmQWxsb3dlZChGcmFtZSog ZnJhbWUsIGNvbnN0IEtVUkwmIHVybCwgYm9vbCBsb2NrSGlzdG9yeSwgYm9vbCBsb2NrQmFja0Zv cndhcmRMaXN0KQogewotICAgIEZyYW1lKiBjYWxsaW5nRnJhbWUgPSBWOFByb3h5OjpyZXRyaWV2 ZUZyYW1lRm9yQ2FsbGluZ0NvbnRleHQoKTsKLSAgICBpZiAoIWNhbGxpbmdGcmFtZSkKKyAgICBG cmFtZSogY2FsbGluZ09yRW50ZXJlZCA9IGNhbGxpbmdPckVudGVyZWRGcmFtZSgpOworICAgIGlm ICghY2FsbGluZ09yRW50ZXJlZCkKICAgICAgICAgcmV0dXJuOwotCiAgICAgaWYgKCFwcm90b2Nv bElzSmF2YVNjcmlwdCh1cmwpIHx8IFNjcmlwdENvbnRyb2xsZXI6OmlzU2FmZVNjcmlwdChmcmFt ZSkpCi0gICAgICAgIGZyYW1lLT5yZWRpcmVjdFNjaGVkdWxlcigpLT5zY2hlZHVsZUxvY2F0aW9u Q2hhbmdlKHVybC5zdHJpbmcoKSwgY2FsbGluZ0ZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZl cnJlcigpLCBsb2NrSGlzdG9yeSwgbG9ja0JhY2tGb3J3YXJkTGlzdCwgcHJvY2Vzc2luZ1VzZXJH ZXN0dXJlKCkpOworICAgICAgICBmcmFtZS0+cmVkaXJlY3RTY2hlZHVsZXIoKS0+c2NoZWR1bGVM b2NhdGlvbkNoYW5nZSh1cmwuc3RyaW5nKCksIGNhbGxpbmdPckVudGVyZWQtPmxvYWRlcigpLT5v dXRnb2luZ1JlZmVycmVyKCksIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0LCBwcm9j ZXNzaW5nVXNlckdlc3R1cmUoKSk7CiB9CiAKIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGdldFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQoKQo=