106641 2013-01-11 01:25:47 -0800 window.history shouldn't be exposed across origins 2013-04-28 15:34:50 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified NEW WebExposed P2 Normal --- 1 abarth abarth ap beidson eric syoichi oldest_to_newest 805060 0 abarth 2013-01-11 01:25:47 -0800 window.history shouldn't be exposed across origins 805065 1 182297 abarth 2013-01-11 01:37:27 -0800 Created attachment 182297 Example patch 805066 2 abarth 2013-01-11 01:38:09 -0800 There are likely some tests that need to change as well. We might also want to measure how often window.history is accessed across origins before making this change. 805068 3 182297 eric 2013-01-11 01:38:52 -0800 Comment on attachment 182297 Example patch This is great! But we need a test. 805069 4 abarth 2013-01-11 01:40:03 -0800 There are plenty of tests. I just haven't actually compiled this patch yet. :) 805358 5 beidson 2013-01-11 10:16:17 -0800 Is this in a spec? 805403 6 abarth 2013-01-11 10:44:39 -0800 > Is this in a spec? This patch aligns our behavior more closely with the spec: http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#security-window There are still a number of differences in what's exposed across origins, which is what the whatwg thread was about. We'd like the implementation and the spec to converge, but it's not completely obvious to me which things should or shouldn't be exposed across origins. As a general rule, I think it makes sense to expose as little as possible while still remaining compatible with the web. 882421 7 eric 2013-04-28 15:34:50 -0700 Mozilla did some investigation of this: Results: https://bug839867.bugzilla.mozilla.org/attachment.cgi?id=712247 More info: https://bugzilla.mozilla.org/show_bug.cgi?id=839867 Suggesting we're the odd man out here. 182297 2013-01-11 01:37:27 -0800 2013-01-11 01:38:52 -0800 Example patch bug-106641-20130111013430.patch text/plain 10902 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg3MGFjMzc0OGM5ODli MmVjNjZjMzRmODZhMzFhZWU4OTczYThmOC4uZDJmNTg3OTUwYTdkZGIxZmU5NDYwNjU0NGUwNTRi ODNhZDg3YmY0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAxLTExICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgd2luZG93Lmhpc3Rvcnkgc2hv dWxkbid0IGJlIGV4cG9zZWQgYWNyb3NzIG9yaWdpbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjY0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIGRpc2N1c3NlZCByZWNlbnRseSBvbiB0aGUgV2hh dFdHIG1haWxpbmcgbGlzdCwgV2ViS2l0IGV4cG9zZXMKKyAgICAgICAgd2luZG93Lmhpc3Rvcnkg YWNyb3NzIG9yaWdpbnMgZGVzcGl0ZSB3aGF0IHRoZSBzcGVjIHNheXMuIEdlY2tvCisgICAgICAg IHJlY2VudGx5IGNoYW5nZWQgdG8gbWF0Y2ggdGhlIHNwZWMgaW4KKyAgICAgICAgaHR0cHM6Ly9i dWd6aWxsYS5tb3ppbGxhLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODAxNTc2CisKKyAgICAgICAgVGhp cyBwYXRjaCBwcmV2ZW50cyB3aW5kb3cuaGlzdG9yeSBmcm9tIGJlaW5nIGV4cG9zZWQgYWNyb3Nz IG9yaWdpbnMKKyAgICAgICAgYW5kIGRlbGV0ZXMgYSBidW5jaCBvZiBjdXN0b20gY29kZSB0aGF0 IGltcGxlbWVudHMgdGhlIHNlY3VyaXR5IGNoZWNrcy4KKworICAgICAgICAqIGJpbmRpbmdzL2pz L0pTSGlzdG9yeUN1c3RvbS5jcHA6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SGlz dG9yeUN1c3RvbS5jcHA6CisgICAgICAgICogcGFnZS9ET01XaW5kb3cuaWRsOgorICAgICAgICAq IHBhZ2UvSGlzdG9yeS5pZGw6CisKIDIwMTMtMDEtMTEgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZp a0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUmVmYWN0b3JpbmcsIG1v dmUgTmV0d29ya1dvcmtzcGFjZVByb3ZpZGVyIHRvIE5ldHdvcmtVSVNvdXJjZUNvZGVQcm92aWRl ci5qcyBhbmQgcmVuYW1lIGl0cyBwYXJlbnQgdG8gU2ltcGxlV29ya3NwYWNlUHJvdmlkZXIuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hpc3RvcnlDdXN0b20uY3Bw IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNIaXN0b3J5Q3VzdG9tLmNwcAppbmRleCAw MDI3ZGRiMTU3MzdkOTEwNWEwNDZiNTE1MTFlODJhODk0NmY3ZGNmLi43MzIwNWQ1MTI4OTRmN2Y3 MmRlZTE4ZDQ4ODZlZjljYjAzYWZmZWE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU0hpc3RvcnlDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTSGlzdG9yeUN1c3RvbS5jcHAKQEAgLTM4LDE0MSArMzgsNiBAQCB1c2luZyBuYW1lc3Bh Y2UgSlNDOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRpYyBKU1ZhbHVlIG5vbkNhY2hp bmdTdGF0aWNCYWNrRnVuY3Rpb25HZXR0ZXIoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlLCBQcm9w ZXJ0eU5hbWUgcHJvcGVydHlOYW1lKQotewotICAgIHJldHVybiBKU0Z1bmN0aW9uOjpjcmVhdGUo ZXhlYywgZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpLCAwLCBwcm9wZXJ0eU5hbWUucHVibGlj TmFtZSgpLCBqc0hpc3RvcnlQcm90b3R5cGVGdW5jdGlvbkJhY2spOwotfQotCi1zdGF0aWMgSlNW YWx1ZSBub25DYWNoaW5nU3RhdGljRm9yd2FyZEZ1bmN0aW9uR2V0dGVyKEV4ZWNTdGF0ZSogZXhl YywgSlNWYWx1ZSwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkKLXsKLSAgICByZXR1cm4gSlNG dW5jdGlvbjo6Y3JlYXRlKGV4ZWMsIGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKSwgMCwgcHJv cGVydHlOYW1lLnB1YmxpY05hbWUoKSwganNIaXN0b3J5UHJvdG90eXBlRnVuY3Rpb25Gb3J3YXJk KTsKLX0KLQotc3RhdGljIEpTVmFsdWUgbm9uQ2FjaGluZ1N0YXRpY0dvRnVuY3Rpb25HZXR0ZXIo RXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlLCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKQotewot ICAgIHJldHVybiBKU0Z1bmN0aW9uOjpjcmVhdGUoZXhlYywgZXhlYy0+bGV4aWNhbEdsb2JhbE9i amVjdCgpLCAxLCBwcm9wZXJ0eU5hbWUucHVibGljTmFtZSgpLCBqc0hpc3RvcnlQcm90b3R5cGVG dW5jdGlvbkdvKTsKLX0KLQotYm9vbCBKU0hpc3Rvcnk6OmdldE93blByb3BlcnR5U2xvdERlbGVn YXRlKEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlT bG90JiBzbG90KQotewotICAgIC8vIFdoZW4gYWNjZXNzaW5nIEhpc3RvcnkgY3Jvc3MtZG9tYWlu LCBmdW5jdGlvbnMgYXJlIGFsd2F5cyB0aGUgbmF0aXZlIGJ1aWx0LWluIG9uZXMuCi0gICAgLy8g U2VlIEpTRE9NV2luZG93OjpnZXRPd25Qcm9wZXJ0eVNsb3REZWxlZ2F0ZSBmb3IgYWRkaXRpb25h bCBkZXRhaWxzLgotCi0gICAgLy8gT3VyIGN1c3RvbSBjb2RlIGlzIG9ubHkgbmVlZGVkIHRvIGlt cGxlbWVudCB0aGUgV2luZG93IGNyb3NzLWRvbWFpbiBzY2hlbWUsIHNvIGlmIGFjY2VzcyBpcwot ICAgIC8vIGFsbG93ZWQsIHJldHVybiBmYWxzZSBzbyB0aGUgbm9ybWFsIGxvb2t1cCB3aWxsIHRh a2UgcGxhY2UuCi0gICAgU3RyaW5nIG1lc3NhZ2U7Ci0gICAgaWYgKHNob3VsZEFsbG93QWNjZXNz VG9GcmFtZShleGVjLCBpbXBsKCktPmZyYW1lKCksIG1lc3NhZ2UpKQotICAgICAgICByZXR1cm4g ZmFsc2U7Ci0KLSAgICAvLyBDaGVjayBmb3IgdGhlIGZldyBmdW5jdGlvbnMgdGhhdCB3ZSBhbGxv dywgZXZlbiB3aGVuIGNhbGxlZCBjcm9zcy1kb21haW4uCi0gICAgY29uc3QgSGFzaEVudHJ5KiBl bnRyeSA9IEpTSGlzdG9yeVByb3RvdHlwZTo6c19pbmZvLnByb3BIYXNoVGFibGUoZXhlYyktPmVu dHJ5KGV4ZWMsIHByb3BlcnR5TmFtZSk7Ci0gICAgaWYgKGVudHJ5KSB7Ci0gICAgICAgIC8vIEFs bG93IGFjY2VzcyB0byBiYWNrKCksIGZvcndhcmQoKSBhbmQgZ28oKSBmcm9tIGFueSBmcmFtZS4K LSAgICAgICAgaWYgKGVudHJ5LT5hdHRyaWJ1dGVzKCkgJiBKU0M6OkZ1bmN0aW9uKSB7Ci0gICAg ICAgICAgICBpZiAoZW50cnktPmZ1bmN0aW9uKCkgPT0ganNIaXN0b3J5UHJvdG90eXBlRnVuY3Rp b25CYWNrKSB7Ci0gICAgICAgICAgICAgICAgc2xvdC5zZXRDdXN0b20odGhpcywgbm9uQ2FjaGlu Z1N0YXRpY0JhY2tGdW5jdGlvbkdldHRlcik7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7 Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKGVudHJ5LT5mdW5jdGlvbigpID09IGpzSGlzdG9yeVBy b3RvdHlwZUZ1bmN0aW9uRm9yd2FyZCkgewotICAgICAgICAgICAgICAgIHNsb3Quc2V0Q3VzdG9t KHRoaXMsIG5vbkNhY2hpbmdTdGF0aWNGb3J3YXJkRnVuY3Rpb25HZXR0ZXIpOwotICAgICAgICAg ICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgfSBlbHNlIGlmIChlbnRyeS0+ZnVuY3Rp b24oKSA9PSBqc0hpc3RvcnlQcm90b3R5cGVGdW5jdGlvbkdvKSB7Ci0gICAgICAgICAgICAgICAg c2xvdC5zZXRDdXN0b20odGhpcywgbm9uQ2FjaGluZ1N0YXRpY0dvRnVuY3Rpb25HZXR0ZXIpOwot ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0g ICAgfSBlbHNlIHsKLSAgICAgICAgLy8gQWxsb3cgYWNjZXNzIHRvIHRvU3RyaW5nKCkgY3Jvc3Mt ZG9tYWluLCBidXQgYWx3YXlzIE9iamVjdC50b1N0cmluZy4KLSAgICAgICAgaWYgKHByb3BlcnR5 TmFtZSA9PSBleGVjLT5wcm9wZXJ0eU5hbWVzKCkudG9TdHJpbmcpIHsKLSAgICAgICAgICAgIHNs b3Quc2V0Q3VzdG9tKHRoaXMsIG9iamVjdFRvU3RyaW5nRnVuY3Rpb25HZXR0ZXIpOwotICAgICAg ICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBwcmludEVycm9yTWVz c2FnZUZvckZyYW1lKGltcGwoKS0+ZnJhbWUoKSwgbWVzc2FnZSk7Ci0gICAgc2xvdC5zZXRVbmRl ZmluZWQoKTsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQotYm9vbCBKU0hpc3Rvcnk6OmdldE93blBy b3BlcnR5RGVzY3JpcHRvckRlbGVnYXRlKEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1lIHBy b3BlcnR5TmFtZSwgUHJvcGVydHlEZXNjcmlwdG9yJiBkZXNjcmlwdG9yKQotewotICAgIGlmICgh aW1wbCgpLT5mcmFtZSgpKSB7Ci0gICAgICAgIGRlc2NyaXB0b3Iuc2V0VW5kZWZpbmVkKCk7Ci0g ICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLQotICAgIC8vIFRocm93IG91dCBhbGwgY3Jvc3Mg ZG9tYWluIGFjY2VzcwotICAgIGlmICghc2hvdWxkQWxsb3dBY2Nlc3NUb0ZyYW1lKGV4ZWMsIGlt cGwoKS0+ZnJhbWUoKSkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgLy8gQ2hlY2sgZm9y IHRoZSBmZXcgZnVuY3Rpb25zIHRoYXQgd2UgYWxsb3csIGV2ZW4gd2hlbiBjYWxsZWQgY3Jvc3Mt ZG9tYWluLgotICAgIGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSBKU0hpc3RvcnlQcm90b3R5cGU6 OnNfaW5mby5wcm9wSGFzaFRhYmxlKGV4ZWMpLT5lbnRyeShleGVjLCBwcm9wZXJ0eU5hbWUpOwot ICAgIGlmIChlbnRyeSkgewotICAgICAgICBQcm9wZXJ0eVNsb3Qgc2xvdDsKLSAgICAgICAgLy8g QWxsb3cgYWNjZXNzIHRvIGJhY2soKSwgZm9yd2FyZCgpIGFuZCBnbygpIGZyb20gYW55IGZyYW1l LgotICAgICAgICBpZiAoZW50cnktPmF0dHJpYnV0ZXMoKSAmIEpTQzo6RnVuY3Rpb24pIHsKLSAg ICAgICAgICAgIGlmIChlbnRyeS0+ZnVuY3Rpb24oKSA9PSBqc0hpc3RvcnlQcm90b3R5cGVGdW5j dGlvbkJhY2spIHsKLSAgICAgICAgICAgICAgICBzbG90LnNldEN1c3RvbSh0aGlzLCBub25DYWNo aW5nU3RhdGljQmFja0Z1bmN0aW9uR2V0dGVyKTsKLSAgICAgICAgICAgICAgICBkZXNjcmlwdG9y LnNldERlc2NyaXB0b3Ioc2xvdC5nZXRWYWx1ZShleGVjLCBwcm9wZXJ0eU5hbWUpLCBlbnRyeS0+ YXR0cmlidXRlcygpKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAg IH0gZWxzZSBpZiAoZW50cnktPmZ1bmN0aW9uKCkgPT0ganNIaXN0b3J5UHJvdG90eXBlRnVuY3Rp b25Gb3J3YXJkKSB7Ci0gICAgICAgICAgICAgICAgc2xvdC5zZXRDdXN0b20odGhpcywgbm9uQ2Fj aGluZ1N0YXRpY0ZvcndhcmRGdW5jdGlvbkdldHRlcik7Ci0gICAgICAgICAgICAgICAgZGVzY3Jp cHRvci5zZXREZXNjcmlwdG9yKHNsb3QuZ2V0VmFsdWUoZXhlYywgcHJvcGVydHlOYW1lKSwgZW50 cnktPmF0dHJpYnV0ZXMoKSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAg ICAgICB9IGVsc2UgaWYgKGVudHJ5LT5mdW5jdGlvbigpID09IGpzSGlzdG9yeVByb3RvdHlwZUZ1 bmN0aW9uR28pIHsKLSAgICAgICAgICAgICAgICBzbG90LnNldEN1c3RvbSh0aGlzLCBub25DYWNo aW5nU3RhdGljR29GdW5jdGlvbkdldHRlcik7Ci0gICAgICAgICAgICAgICAgZGVzY3JpcHRvci5z ZXREZXNjcmlwdG9yKHNsb3QuZ2V0VmFsdWUoZXhlYywgcHJvcGVydHlOYW1lKSwgZW50cnktPmF0 dHJpYnV0ZXMoKSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICB9 Ci0gICAgICAgIH0KLSAgICB9IGVsc2UgewotICAgICAgICAvLyBBbGxvdyBhY2Nlc3MgdG8gdG9T dHJpbmcoKSBjcm9zcy1kb21haW4sIGJ1dCBhbHdheXMgT2JqZWN0LnRvU3RyaW5nLgotICAgICAg ICBpZiAocHJvcGVydHlOYW1lID09IGV4ZWMtPnByb3BlcnR5TmFtZXMoKS50b1N0cmluZykgewot ICAgICAgICAgICAgUHJvcGVydHlTbG90IHNsb3Q7Ci0gICAgICAgICAgICBzbG90LnNldEN1c3Rv bSh0aGlzLCBvYmplY3RUb1N0cmluZ0Z1bmN0aW9uR2V0dGVyKTsKLSAgICAgICAgICAgIGRlc2Ny aXB0b3Iuc2V0RGVzY3JpcHRvcihzbG90LmdldFZhbHVlKGV4ZWMsIHByb3BlcnR5TmFtZSksIGVu dHJ5LT5hdHRyaWJ1dGVzKCkpOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0K LSAgICB9Ci0KLSAgICBkZXNjcmlwdG9yLnNldFVuZGVmaW5lZCgpOwotICAgIHJldHVybiB0cnVl OwotfQotCi1ib29sIEpTSGlzdG9yeTo6cHV0RGVsZWdhdGUoRXhlY1N0YXRlKiBleGVjLCBQcm9w ZXJ0eU5hbWUsIEpTVmFsdWUsIFB1dFByb3BlcnR5U2xvdCYpCi17Ci0gICAgLy8gT25seSBhbGxv dyBwdXR0aW5nIGJ5IGZyYW1lcyBpbiB0aGUgc2FtZSBvcmlnaW4uCi0gICAgaWYgKCFzaG91bGRB bGxvd0FjY2Vzc1RvRnJhbWUoZXhlYywgaW1wbCgpLT5mcmFtZSgpKSkKLSAgICAgICAgcmV0dXJu IHRydWU7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCi1ib29sIEpTSGlzdG9yeTo6ZGVsZXRlUHJv cGVydHkoSlNDZWxsKiBjZWxsLCBFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZSBwcm9wZXJ0 eU5hbWUpCi17Ci0gICAgSlNIaXN0b3J5KiB0aGlzT2JqZWN0ID0ganNDYXN0PEpTSGlzdG9yeSo+ KGNlbGwpOwotICAgIC8vIE9ubHkgYWxsb3cgZGVsZXRpbmcgYnkgZnJhbWVzIGluIHRoZSBzYW1l IG9yaWdpbi4KLSAgICBpZiAoIXNob3VsZEFsbG93QWNjZXNzVG9GcmFtZShleGVjLCB0aGlzT2Jq ZWN0LT5pbXBsKCktPmZyYW1lKCkpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmV0dXJu IEJhc2U6OmRlbGV0ZVByb3BlcnR5KHRoaXNPYmplY3QsIGV4ZWMsIHByb3BlcnR5TmFtZSk7Ci19 Ci0KLWJvb2wgSlNIaXN0b3J5OjpkZWxldGVQcm9wZXJ0eUJ5SW5kZXgoSlNDZWxsKiBjZWxsLCBF eGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkIHByb3BlcnR5TmFtZSkKLXsKLSAgICBKU0hpc3Rvcnkq IHRoaXNPYmplY3QgPSBqc0Nhc3Q8SlNIaXN0b3J5Kj4oY2VsbCk7Ci0gICAgLy8gT25seSBhbGxv dyBkZWxldGluZyBieSBmcmFtZXMgaW4gdGhlIHNhbWUgb3JpZ2luLgotICAgIGlmICghc2hvdWxk QWxsb3dBY2Nlc3NUb0ZyYW1lKGV4ZWMsIHRoaXNPYmplY3QtPmltcGwoKS0+ZnJhbWUoKSkpCi0g ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXR1cm4gQmFzZTo6ZGVsZXRlUHJvcGVydHlCeUlu ZGV4KHRoaXNPYmplY3QsIGV4ZWMsIHByb3BlcnR5TmFtZSk7Ci19Ci0KLXZvaWQgSlNIaXN0b3J5 OjpnZXRPd25Qcm9wZXJ0eU5hbWVzKEpTT2JqZWN0KiBvYmplY3QsIEV4ZWNTdGF0ZSogZXhlYywg UHJvcGVydHlOYW1lQXJyYXkmIHByb3BlcnR5TmFtZXMsIEVudW1lcmF0aW9uTW9kZSBtb2RlKQot ewotICAgIEpTSGlzdG9yeSogdGhpc09iamVjdCA9IGpzQ2FzdDxKU0hpc3RvcnkqPihvYmplY3Qp OwotICAgIC8vIE9ubHkgYWxsb3cgdGhlIGhpc3Rvcnkgb2JqZWN0IHRvIGVudW1lcmF0ZWQgYnkg ZnJhbWVzIGluIHRoZSBzYW1lIG9yaWdpbi4KLSAgICBpZiAoIXNob3VsZEFsbG93QWNjZXNzVG9G cmFtZShleGVjLCB0aGlzT2JqZWN0LT5pbXBsKCktPmZyYW1lKCkpKQotICAgICAgICByZXR1cm47 Ci0gICAgQmFzZTo6Z2V0T3duUHJvcGVydHlOYW1lcyh0aGlzT2JqZWN0LCBleGVjLCBwcm9wZXJ0 eU5hbWVzLCBtb2RlKTsKLX0KLQogSlNWYWx1ZSBKU0hpc3Rvcnk6OnN0YXRlKEV4ZWNTdGF0ZSAq ZXhlYykgY29uc3QKIHsKICAgICBIaXN0b3J5KiBoaXN0b3J5ID0gc3RhdGljX2Nhc3Q8SGlzdG9y eSo+KGltcGwoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhIaXN0b3J5Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOEhpc3RvcnlDdXN0b20uY3BwCmluZGV4IGY0NjNjMjNhMTE2ZjJiOWQzYzk1ODhkYjVlZDEx MTZlYTg4NDljMmIuLmVjY2QzMjU3NDRiZjk5NjdlYjFkZDM0YjI5MzA4YTMwNzc3NjliZmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhpc3RvcnlDdXN0 b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhpc3RvcnlD dXN0b20uY3BwCkBAIC05MSwxNiArOTEsNCBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhIaXN0 b3J5OjpyZXBsYWNlU3RhdGVDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogICAg IHJldHVybiBzZXRET01FeGNlcHRpb24oZWMsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKIH0KIAotYm9v bCBWOEhpc3Rvcnk6OmluZGV4ZWRTZWN1cml0eUNoZWNrKHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBo b3N0LCB1aW50MzJfdCBpbmRleCwgdjg6OkFjY2Vzc1R5cGUgdHlwZSwgdjg6OkxvY2FsPHY4OjpW YWx1ZT4pCi17Ci0gICAgSGlzdG9yeSogaGlzdG9yeSA9IFY4SGlzdG9yeTo6dG9OYXRpdmUoaG9z dCk7Ci0gICAgcmV0dXJuIEJpbmRpbmdTZWN1cml0eTo6c2hvdWxkQWxsb3dBY2Nlc3NUb0ZyYW1l KEJpbmRpbmdTdGF0ZTo6aW5zdGFuY2UoKSwgaGlzdG9yeS0+ZnJhbWUoKSwgRG9Ob3RSZXBvcnRT ZWN1cml0eUVycm9yKTsKLX0KLQotYm9vbCBWOEhpc3Rvcnk6Om5hbWVkU2VjdXJpdHlDaGVjayh2 ODo6TG9jYWw8djg6Ok9iamVjdD4gaG9zdCwgdjg6OkxvY2FsPHY4OjpWYWx1ZT4ga2V5LCB2ODo6 QWNjZXNzVHlwZSB0eXBlLCB2ODo6TG9jYWw8djg6OlZhbHVlPikKLXsKLSAgICBIaXN0b3J5KiBo aXN0b3J5ID0gVjhIaXN0b3J5Ojp0b05hdGl2ZShob3N0KTsKLSAgICByZXR1cm4gQmluZGluZ1Nl Y3VyaXR5OjpzaG91bGRBbGxvd0FjY2Vzc1RvRnJhbWUoQmluZGluZ1N0YXRlOjppbnN0YW5jZSgp LCBoaXN0b3J5LT5mcmFtZSgpLCBEb05vdFJlcG9ydFNlY3VyaXR5RXJyb3IpOwotfQotCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdp bmRvdy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwKaW5kZXggZmMzN2Iy MDRkOWI4Mjc0ZDcwMGJiYzY4ZTU0MDE0YzJhZDVkZGEwZS4uOWQwMzQ0NjNkNzM5NzQ5YzdhMmUy ZjgwMjEyNjRiMWRkYzZjZTdiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01X aW5kb3cuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmlkbApAQCAtNDQs NyArNDQsNyBAQAogXSBpbnRlcmZhY2UgRE9NV2luZG93IHsKICAgICAvLyBET00gTGV2ZWwgMAog ICAgIFtSZXBsYWNlYWJsZV0gcmVhZG9ubHkgYXR0cmlidXRlIFNjcmVlbiBzY3JlZW47Ci0gICAg W1JlcGxhY2VhYmxlLCBEb05vdENoZWNrU2VjdXJpdHlPbkdldHRlcl0gcmVhZG9ubHkgYXR0cmli dXRlIEhpc3RvcnkgaGlzdG9yeTsKKyAgICBbUmVwbGFjZWFibGVdIHJlYWRvbmx5IGF0dHJpYnV0 ZSBIaXN0b3J5IGhpc3Rvcnk7CiAgICAgW1JlcGxhY2VhYmxlXSByZWFkb25seSBhdHRyaWJ1dGUg QmFySW5mbyBsb2NhdGlvbmJhcjsKICAgICBbUmVwbGFjZWFibGVdIHJlYWRvbmx5IGF0dHJpYnV0 ZSBCYXJJbmZvIG1lbnViYXI7CiAgICAgW1JlcGxhY2VhYmxlXSByZWFkb25seSBhdHRyaWJ1dGUg QmFySW5mbyBwZXJzb25hbGJhcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvSGlz dG9yeS5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0hpc3RvcnkuaWRsCmluZGV4IDk5YTlkYmVl YWQwOGI5OWVhNzkxNGYzNGViYjQ3MjQ2YzYzNTFkY2QuLjY0ODY3MzAyZmVlYmE0ZjcwYWE2Mjk4 MzQzZjMzNzk2NDY2YjMzZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvSGlzdG9y eS5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9IaXN0b3J5LmlkbApAQCAtMjQsMjIgKzI0 LDE1IEBACiAgKi8KIAogWwotI2lmIGRlZmluZWQoVjhfQklORElORykgJiYgVjhfQklORElORwot ICAgIENoZWNrU2VjdXJpdHksCi0jZW5kaWYKLSAgICBKU0N1c3RvbUdldE93blByb3BlcnR5U2xv dEFuZERlc2NyaXB0b3IsCi0gICAgQ3VzdG9tTmFtZWRTZXR0ZXIsCiAgICAgSlNHZW5lcmF0ZUlz UmVhY2hhYmxlPUltcGxGcmFtZSwKLSAgICBDdXN0b21EZWxldGVQcm9wZXJ0eSwKLSAgICBDdXN0 b21FbnVtZXJhdGVQcm9wZXJ0eSwKICAgICBPbWl0Q29uc3RydWN0b3IKIF0gaW50ZXJmYWNlIEhp c3RvcnkgewogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nIGxlbmd0aDsKICAg ICBbQ2FjaGVkQXR0cmlidXRlLCBDdXN0b21dIHJlYWRvbmx5IGF0dHJpYnV0ZSBTZXJpYWxpemVk U2NyaXB0VmFsdWUgc3RhdGU7CiAKLSAgICBbRG9Ob3RDaGVja1NlY3VyaXR5LCBDYWxsV2l0aD1T Y3JpcHRFeGVjdXRpb25Db250ZXh0XSB2b2lkIGJhY2soKTsKLSAgICBbRG9Ob3RDaGVja1NlY3Vy aXR5LCBDYWxsV2l0aD1TY3JpcHRFeGVjdXRpb25Db250ZXh0XSB2b2lkIGZvcndhcmQoKTsKLSAg ICBbRG9Ob3RDaGVja1NlY3VyaXR5LCBDYWxsV2l0aD1TY3JpcHRFeGVjdXRpb25Db250ZXh0XSB2 b2lkIGdvKGluIFtPcHRpb25hbD1EZWZhdWx0SXNVbmRlZmluZWRdIGxvbmcgZGlzdGFuY2UpOwor ICAgIFtDYWxsV2l0aD1TY3JpcHRFeGVjdXRpb25Db250ZXh0XSB2b2lkIGJhY2soKTsKKyAgICBb Q2FsbFdpdGg9U2NyaXB0RXhlY3V0aW9uQ29udGV4dF0gdm9pZCBmb3J3YXJkKCk7CisgICAgW0Nh bGxXaXRoPVNjcmlwdEV4ZWN1dGlvbkNvbnRleHRdIHZvaWQgZ28oaW4gW09wdGlvbmFsPURlZmF1 bHRJc1VuZGVmaW5lZF0gbG9uZyBkaXN0YW5jZSk7CiAKICAgICBbQ3VzdG9tLCBWOEVuYWJsZWRQ ZXJDb250ZXh0PXB1c2hTdGF0ZV0gdm9pZCBwdXNoU3RhdGUoaW4gYW55IGRhdGEsIGluIERPTVN0 cmluZyB0aXRsZSwgaW4gW09wdGlvbmFsXSBET01TdHJpbmcgdXJsKQogICAgICAgICByYWlzZXMo RE9NRXhjZXB0aW9uKTsK