36732 2010-03-28 13:36:00 -0700 sandboxed iframes from same origin should not be granted notification permission of the parent frame unless allow-same-origin is specified 2013-01-02 11:17:07 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 rafaelw mkwst abarth mkwst webkit.review.bot oldest_to_newest 205221 0 rafaelw 2010-03-28 13:36:00 -0700 <iframe sandbox="allow-scripts"> from the same origin as the host page should be restricted from webkitNotifications.requestPermission(), webkitNotification.createNotification() & webkitNotification.createHTMLNotification unless allow-same-origin is specified. The underlying issue is that isUnique() is not being observed. Note that https://bugs.webkit.org/show_bug.cgi?id=36625 changes the interface of NotificationPresenter to pass the url rather than the security origin, so clients will not longer be able to observe the bit. Per discussion with abarth on #webkit, the preferred approach will be to have the check of isUnique() take place prior to calling into the clients NotificationPresenter. Allow per discussion with abarth on #webkit, I set about creating an (if checked in, failing) layout test, but the notifications layout tests do not yet support granting permission via the layoutController and are disabled, so I've attached a simple html test that should be easily adapted to a layout test. 205224 1 51866 rafaelw 2010-03-28 13:37:54 -0700 Created attachment 51866 html test This test loads the same document twice as an iframe, once with sandbox="allow-scripts" and once with sandbox="allow-scripts allow-same-origin". If the parent frame is granted notification permission, only the allow-same-origin iframe should report that it has been granted permission as well. 220358 2 abarth 2010-05-03 16:32:06 -0700 Looking now. 220383 3 54978 abarth 2010-05-03 17:27:07 -0700 Created attachment 54978 Patch 220384 4 abarth 2010-05-03 17:28:50 -0700 I don't know how to build with this feature turned on, but this is how I would fix it if I could. I also did some misc cleanup while I was trying to understand the code. Would someone who knows how to build/test this feature be willing to see if this code actually compiles and to write a test? Many thanks. 220385 5 54979 abarth 2010-05-03 17:30:26 -0700 Created attachment 54979 Patch 798162 6 mkwst 2012-12-29 13:41:43 -0800 It looks like this was fixed in https://bugs.webkit.org/show_bug.cgi?id=79704 That patch didn't add a test for sandboxed frames, however. I'll put one together to close this bug out. 798163 7 180944 mkwst 2012-12-29 13:45:31 -0800 Created attachment 180944 Patch 798745 8 180944 abarth 2013-01-02 11:10:53 -0800 Comment on attachment 180944 Patch Thanks for the test. 798748 9 180944 webkit.review.bot 2013-01-02 11:17:03 -0800 Comment on attachment 180944 Patch Clearing flags on attachment: 180944 Committed r138624: <http://trac.webkit.org/changeset/138624> 798749 10 webkit.review.bot 2013-01-02 11:17:07 -0800 All reviewed patches have been landed. Closing bug. 51866 2010-03-28 13:37:54 -0700 2010-03-28 13:37:54 -0700 html test notification-from-sandbox-html-test.zip application/x-zip-compressed 906 rafaelw UEsDBBQAAAAIAGdqfDzU5d6WvgAAABoBAAAlAAAAbm90aWZpY2F0aW9uLWZyb20tc2FuZGJveC1p ZnJhbWUuaHRtbF2QwQrCMAyG73uK2JNeJl51mygKCioefIHaRhvsWlk7xhDf3dZtCOb0BfL/+ZNM +VIXCUCmkMsIAZ2o6OmLpCEjbZNaoy2XkMOtNsKTNeMJvMKktKIu0fj0jn6rMeK63csxU9ydsSrJ uTDMJikZg9XucjxAHmSxRg1eH+RP1tONBI+mLhUKxaMXdluWwFZa2wYlgzmwDRoKuEjeXc7pEDTy kD+7Wtn2h6gZkMz/8hQ77uDXB+Wsc+iEof++5ANQSwMEFAAAAAgAmmp8PIhQJB2YAQAAqAQAAB4A AABub3RpZmljYXRpb24tZnJvbS1zYW5kYm94Lmh0bWzNVLFu4zAM3fMVjKYWODVNgFsSxzfcdMvh cOvhBlmiIyGy5EoKkqLov5eqnNSoO2QpUE0kzUfy8UmudOpsPQOoNAqVDTKjDKZP9WzWHpxMxjuQ GuX+D4bOxEj+zS08UaqwGNLN/IjN3qTfPpnWSJHz490U8AOYsNYfUTFYA1PoDJm3m9nzqE/AhwPG NOn0UYtpbi5WGCzOFLJ9ZlY1Xj0OFPUSvJPWyP2WTWbdsPpnjsFbkKosP4AOM7wD/y3RCbzg55zD rxbciAz0l8wIIiDsgnAJFSQPSSP0FHMJ2iA6/JYjVGk4rzvlkT5wH8zOODCvaRC1P1gFzaVYxo0a gYi0VmuB8zOxVQ1RONX405aVumWNcdqFEaPVgCsNr4cS6u3E9Ghxy45GJb2G7/f3/WkDGs1OpzWs itv4oDCsIXpriJEVJM0S+tO7SkFu2XirvA2+48NYvEx5l+87q6tFcT9HE6mNVWcdWh8kkkcLh4Mz dDNA+U6QXxTKTUcqXaqM+1+jEYN/88mu/18r09cSJb/a8lirRflBvQBQSwECFAAUAAAACABnanw8 1OXelr4AAAAaAQAAJQAAAAAAAAAAACAAAAAAAAAAbm90aWZpY2F0aW9uLWZyb20tc2FuZGJveC1p ZnJhbWUuaHRtbFBLAQIUABQAAAAIAJpqfDyIUCQdmAEAAKgEAAAeAAAAAAAAAAAAIAAAAAEBAABu b3RpZmljYXRpb24tZnJvbS1zYW5kYm94Lmh0bWxQSwUGAAAAAAIAAgCfAAAA1QIAAAAA 54978 2010-05-03 17:27:07 -0700 2010-05-03 17:30:19 -0700 Patch bug-36732-20100503172706.patch text/plain 8350 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTY4NjJjYmE5OTBhN2Y2ZmU3ZTNhYTllNGNkYTMxNTYzOWFiYmU4MS4uNjYwNGRiNGExNGY5ZTYy YTg5OGNkMTNmNjRkMGM1ZWZkMzA5N2E2NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNS0wMyAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIHNhbmRib3hlZCBpZnJhbWVzIGZyb20gc2FtZSBvcmlnaW4g c2hvdWxkIG5vdCBiZSBncmFudGVkIG5vdGlmaWNhdGlvbiBwZXJtaXNzaW9uIG9mIHRoZSBwYXJl bnQgZnJhbWUgdW5sZXNzIGFsbG93LXNhbWUtb3JpZ2luIGlzIHNwZWNpZmllZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY3MzIKKworICAgICAgICBO byBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIG5vdGlmaWNhdGlvbnMvTm90aWZpY2F0 aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbjo6Tm90aWZpY2F0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbjo6YWxsb3dlZCk6CisgICAgICAgICogbm90 aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uaDoKKyAgICAgICAgKiBub3RpZmljYXRpb25zL05vdGlm aWNhdGlvbkNlbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25DZW50ZXI6 Ok5vdGlmaWNhdGlvbkNlbnRlcik6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25DZW50 ZXI6OmNoZWNrUGVybWlzc2lvbik6CisgICAgICAgICogbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRp b25DZW50ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkNlbnRlcjo6Y3JlYXRl SFRNTE5vdGlmaWNhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25DZW50ZXI6 OmNyZWF0ZU5vdGlmaWNhdGlvbik6CisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5oOgor ICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OmNhbkFjY2Vzc05vdGlmaWNhdGlvbnMp OgorCiAyMDEwLTA1LTAyICBEdW1pdHJ1IERhbmlsaXVjICA8ZHVtaUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbm90 aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uY3BwIGIvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlm aWNhdGlvbi5jcHAKaW5kZXggMTgyZjcxM2YzZmE0YzcxYjg3YTJhMzU3NjI0YjQ4OTk1MmQ2YTNk NS4uMDAyY2VhNjFhZTEzMzcxYmY4MjNhMjc5Y2M2NTNjMjcwMDkzNmU3MSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAKKysrIGIvV2ViQ29yZS9ub3Rp ZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAKQEAgLTQ5LDcgKzQ5LDcgQEAgTm90aWZpY2F0aW9u OjpOb3RpZmljYXRpb24oY29uc3QgS1VSTCYgdXJsLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBj b250ZXh0LCBFeGMKICAgICAsIG1fcHJlc2VudGVyKHByb3ZpZGVyKQogewogICAgIEFTU0VSVCht X3ByZXNlbnRlcik7Ci0gICAgaWYgKG1fcHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24oY29udGV4 dC0+dXJsKCkpICE9IE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkFsbG93ZWQpIHsK KyAgICBpZiAoIWFsbG93ZWQoKSkgewogICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KQEAgLTcwLDcgKzcwLDcgQEAgTm90aWZpY2F0aW9uOjpOb3RpZmlj YXRpb24oY29uc3QgTm90aWZpY2F0aW9uQ29udGVudHMmIGNvbnRlbnRzLCBTY3JpcHRFeGVjdXRp b24KICAgICAsIG1fcHJlc2VudGVyKHByb3ZpZGVyKQogewogICAgIEFTU0VSVChtX3ByZXNlbnRl cik7Ci0gICAgaWYgKG1fcHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24oY29udGV4dC0+dXJsKCkp ICE9IE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkFsbG93ZWQpIHsKKyAgICBpZiAo IWFsbG93ZWQoKSkgewogICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKICAgICAgICAgcmV0dXJu OwogICAgIH0KQEAgLTg2LDYgKzg2LDExIEBAIE5vdGlmaWNhdGlvbjo6fk5vdGlmaWNhdGlvbigp CiAgICAgbV9wcmVzZW50ZXItPm5vdGlmaWNhdGlvbk9iamVjdERlc3Ryb3llZCh0aGlzKTsKIH0K IAorYm9vbCBOb3RpZmljYXRpb246OmFsbG93ZWQoKQoreworICAgIHJldHVybiBtX3ByZXNlbnRl ci0+Y2hlY2tQZXJtaXNzaW9uKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dXJsKCkpID09IE5v dGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkFsbG93ZWQ7Cit9CisKIHZvaWQgTm90aWZp Y2F0aW9uOjpzaG93KCkgCiB7CiAgICAgLy8gcHJldmVudCBkb3VibGUtc2hvd2luZwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5oIGIvV2ViQ29yZS9ub3Rp ZmljYXRpb25zL05vdGlmaWNhdGlvbi5oCmluZGV4IDk4Y2JmZGY5ZDY2NWM1YmU0ZDFmNjNjMWZm N2QwZjYxMWJhNjU5MzAuLjQxMzYxNGYwMTgzYmFhMjk2OTE1OGM2MzQ3NTYxZTQ5ZWY4MjA3ODcg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uaAorKysgYi9X ZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmgKQEAgLTUxLDE4ICs1MSwxNiBAQAog I2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAgY2xh c3MgV29ya2VyQ29udGV4dDsKLQogICAgIGNsYXNzIE5vdGlmaWNhdGlvbiA6IHB1YmxpYyBSZWZD b3VudGVkPE5vdGlmaWNhdGlvbj4sIHB1YmxpYyBBY3RpdmVET01PYmplY3QsIHB1YmxpYyBFdmVu dFRhcmdldCB7IAogICAgIHB1YmxpYzoKICAgICAgICAgc3RhdGljIE5vdGlmaWNhdGlvbiogY3Jl YXRlKGNvbnN0IEtVUkwmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgRXhj ZXB0aW9uQ29kZSYgZWMsIE5vdGlmaWNhdGlvblByZXNlbnRlciogcHJvdmlkZXIpIHsgcmV0dXJu IG5ldyBOb3RpZmljYXRpb24odXJsLCBjb250ZXh0LCBlYywgcHJvdmlkZXIpOyB9CiAgICAgICAg IHN0YXRpYyBOb3RpZmljYXRpb24qIGNyZWF0ZShjb25zdCBOb3RpZmljYXRpb25Db250ZW50cyYg Y29udGVudHMsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIEV4Y2VwdGlvbkNvZGUm IGVjLCBOb3RpZmljYXRpb25QcmVzZW50ZXIqIHByb3ZpZGVyKSB7IHJldHVybiBuZXcgTm90aWZp Y2F0aW9uKGNvbnRlbnRzLCBjb250ZXh0LCBlYywgcHJvdmlkZXIpOyB9Ci0gICAgICAgIAorCiAg ICAgICAgIHZpcnR1YWwgfk5vdGlmaWNhdGlvbigpOwogCiAgICAgICAgIHZvaWQgc2hvdygpOwog ICAgICAgICB2b2lkIGNhbmNlbCgpOwotICAgIAorCiAgICAgICAgIGJvb2wgaXNIVE1MKCkgeyBy ZXR1cm4gbV9pc0hUTUw7IH0KICAgICAgICAgS1VSTCB1cmwoKSB7IHJldHVybiBtX25vdGlmaWNh dGlvblVSTDsgfQogICAgICAgICBLVVJMIGljb25VUkwoKSB7IHJldHVybiBtX2NvbnRlbnRzLmlj b24oKTsgfQpAQCAtNzEsMTAgKzY5LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg REVGSU5FX0FUVFJJQlVURV9FVkVOVF9MSVNURU5FUihkaXNwbGF5KTsKICAgICAgICAgREVGSU5F X0FUVFJJQlVURV9FVkVOVF9MSVNURU5FUihlcnJvcik7CiAgICAgICAgIERFRklORV9BVFRSSUJV VEVfRVZFTlRfTElTVEVORVIoY2xvc2UpOwotICAgIAorCiAgICAgICAgIHVzaW5nIFJlZkNvdW50 ZWQ8Tm90aWZpY2F0aW9uPjo6cmVmOwogICAgICAgICB1c2luZyBSZWZDb3VudGVkPE5vdGlmaWNh dGlvbj46OmRlcmVmOwotICAgIAorCiAgICAgICAgIC8vIEV2ZW50VGFyZ2V0IGludGVyZmFjZQog ICAgICAgICB2aXJ0dWFsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKSBjb25zdCB7IHJldHVybiBBY3RpdmVET01PYmplY3Q6OnNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKTsgfQogICAgICAgICB2aXJ0dWFsIE5vdGlmaWNhdGlvbiogdG9Ob3RpZmljYXRpb24o KSB7IHJldHVybiB0aGlzOyB9CkBAIC04Myw2ICs4MSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgTm90aWZpY2F0aW9uKGNvbnN0IEtVUkwmLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgRXhjZXB0aW9uQ29kZSYsIE5vdGlmaWNhdGlvblByZXNlbnRlciopOwogICAgICAgICBOb3Rp ZmljYXRpb24oY29uc3QgTm90aWZpY2F0aW9uQ29udGVudHMmLCBTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiwgRXhjZXB0aW9uQ29kZSYsIE5vdGlmaWNhdGlvblByZXNlbnRlciopOwogCisgICAgICAg IFBlcm1pc3Npb24gY2hlY2tQZXJtaXNzaW9uKCk7CisKICAgICAgICAgLy8gRXZlbnRUYXJnZXQg aW50ZXJmYWNlCiAgICAgICAgIHZpcnR1YWwgdm9pZCByZWZFdmVudFRhcmdldCgpIHsgcmVmKCk7 IH0KICAgICAgICAgdmlydHVhbCB2b2lkIGRlcmVmRXZlbnRUYXJnZXQoKSB7IGRlcmVmKCk7IH0K QEAgLTk2LDcgKzk2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1faXNT aG93aW5nOwogCiAgICAgICAgIE5vdGlmaWNhdGlvblByZXNlbnRlciogbV9wcmVzZW50ZXI7Ci0g ICAgICAgIAorCiAgICAgICAgIEV2ZW50VGFyZ2V0RGF0YSBtX2V2ZW50VGFyZ2V0RGF0YTsKICAg ICB9OwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uQ2Vu dGVyLmNwcCBiL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25DZW50ZXIuY3BwCmlu ZGV4IDgwODlkODdiZDE4NjU2Yjg5NjE5MzRjNmIxMmY0ZDBhYzU0ZTJiYzQuLmVhNjA1ZDFlNWIw NTY3MjNlZDA3M2Q5MjljMDM5Y2I1OTRmMjU3MGUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbm90aWZp Y2F0aW9ucy9Ob3RpZmljYXRpb25DZW50ZXIuY3BwCisrKyBiL1dlYkNvcmUvbm90aWZpY2F0aW9u cy9Ob3RpZmljYXRpb25DZW50ZXIuY3BwCkBAIC00MiwxMCArNDIsMTYgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiBOb3RpZmljYXRpb25DZW50ZXI6Ok5vdGlmaWNhdGlvbkNlbnRlcihTY3JpcHRF eGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBOb3RpZmljYXRpb25QcmVzZW50ZXIqIHByZXNlbnRl cikKICAgICA6IEFjdGl2ZURPTU9iamVjdChjb250ZXh0LCB0aGlzKQotICAgICwgbV9zY3JpcHRF eGVjdXRpb25Db250ZXh0KGNvbnRleHQpCi0gICAgLCBtX25vdGlmaWNhdGlvblByZXNlbnRlcihw cmVzZW50ZXIpIHt9CisgICAgLCBtX25vdGlmaWNhdGlvblByZXNlbnRlcihwcmVzZW50ZXIpCit7 CisgICAgaWYgKCFzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnNlY3VyaXR5T3JpZ2luKCktPmNh bkFjY2Vzc05vdGlmaWNhdGlvbnMoKSkgeworICAgICAgICAvLyBJZiB0aGUgc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCBjYW5ub3QgYWNjZXNzIG5vdGlmaWNhdGlvbnMsIHdlCisgICAgICAgIC8vIGRp c2Nvbm5lY3QgZnJvbSB0aGUgcHJlc2VudGVyIHRvIGF2b2lkIHByZXNlbnRpbmcgYW55IG5vdGlm aWNhdGlvbnMuCisgICAgICAgIG1fbm90aWZpY2F0aW9uUHJlc2VudGVyID0gMDsKKyAgICB9Cit9 CiAKLWludCBOb3RpZmljYXRpb25DZW50ZXI6OmNoZWNrUGVybWlzc2lvbigpCitQZXJtaXNzaW9u IE5vdGlmaWNhdGlvbkNlbnRlcjo6Y2hlY2tQZXJtaXNzaW9uKCkKIHsKICAgICBpZiAoIXByZXNl bnRlcigpKQogICAgICAgICByZXR1cm4gTm90aWZpY2F0aW9uUHJlc2VudGVyOjpQZXJtaXNzaW9u RGVuaWVkOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNl bnRlci5oIGIvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNlbnRlci5oCmluZGV4 IGFjZjFhZTVlZTA3MjRkY2Y0ZGNjZDRjOGI4NDkyZTgxMDBjYmQyY2YuLmYwNjAwM2QxMjhiYzZk Njk2OTY4NDBhZGFiYWRlNjEwZTEyMTgwOWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbm90aWZpY2F0 aW9ucy9Ob3RpZmljYXRpb25DZW50ZXIuaAorKysgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90 aWZpY2F0aW9uQ2VudGVyLmgKQEAgLTU5LDcgKzU5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICAgICAgICAgIGVjID0gU1lOVEFYX0VSUjsKICAgICAgICAgICAgICAgICByZXR1cm4g MDsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBOb3RpZmljYXRpb246OmNyZWF0 ZShtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPmNvbXBsZXRlVVJMKFVSSSksIGNvbnRleHQoKSwg ZWMsIHByZXNlbnRlcigpKTsKKyAgICAgICAgICAgIHJldHVybiBOb3RpZmljYXRpb246OmNyZWF0 ZShzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmNvbXBsZXRlVVJMKFVSSSksIGNvbnRleHQoKSwg ZWMsIHByZXNlbnRlcigpKTsKICAgICAgICAgfQogCiAgICAgICAgIE5vdGlmaWNhdGlvbiogY3Jl YXRlTm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgaWNvblVSSSwgY29uc3QgU3RyaW5nJiB0aXRs ZSwgY29uc3QgU3RyaW5nJiBib2R5LCBFeGNlcHRpb25Db2RlJiBlYykKQEAgLTY4LDE0ICs2OCwx MyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAgICAgZWMgPSBJTlZBTElEX1NU QVRFX0VSUjsKICAgICAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgIE5vdGlmaWNhdGlvbkNvbnRlbnRzIGNvbnRlbnRzKGljb25VUkkuaXNFbXB0eSgpID8g S1VSTCgpIDogbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LT5jb21wbGV0ZVVSTChpY29uVVJJKSwg dGl0bGUsIGJvZHkpOworICAgICAgICAgICAgTm90aWZpY2F0aW9uQ29udGVudHMgY29udGVudHMo aWNvblVSSS5pc0VtcHR5KCkgPyBLVVJMKCkgOiBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmNv bXBsZXRlVVJMKGljb25VUkkpLCB0aXRsZSwgYm9keSk7CiAgICAgICAgICAgICByZXR1cm4gTm90 aWZpY2F0aW9uOjpjcmVhdGUoY29udGVudHMsIGNvbnRleHQoKSwgZWMsIHByZXNlbnRlcigpKTsK ICAgICAgICAgfQogCi0gICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQoKSBj b25zdCB7IHJldHVybiBtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQ7IH0KICAgICAgICAgTm90aWZp Y2F0aW9uUHJlc2VudGVyKiBwcmVzZW50ZXIoKSBjb25zdCB7IHJldHVybiBtX25vdGlmaWNhdGlv blByZXNlbnRlcjsgfQogCi0gICAgICAgIGludCBjaGVja1Blcm1pc3Npb24oKTsKKyAgICAgICAg UGVybWlzc2lvbiBjaGVja1Blcm1pc3Npb24oKTsKICAgICAgICAgdm9pZCByZXF1ZXN0UGVybWlz c2lvbihQYXNzUmVmUHRyPFZvaWRDYWxsYmFjaz4gY2FsbGJhY2spOwogCiAgICAgICAgIHZvaWQg ZGlzY29ubmVjdEZyYW1lKCkgeyBtX25vdGlmaWNhdGlvblByZXNlbnRlciA9IDA7IH0KQEAgLTgz LDcgKzgyLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHByaXZhdGU6CiAgICAgICAgIE5v dGlmaWNhdGlvbkNlbnRlcihTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgTm90aWZpY2F0aW9uUHJl c2VudGVyKik7CiAKLSAgICAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogbV9zY3JpcHRFeGVj dXRpb25Db250ZXh0OwogICAgICAgICBOb3RpZmljYXRpb25QcmVzZW50ZXIqIG1fbm90aWZpY2F0 aW9uUHJlc2VudGVyOwogICAgIH07CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9TZWN1cml0 eU9yaWdpbi5oIGIvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgKaW5kZXggZDczMjY2NDcw ZDg3YzA2MjA4YTA3MDc3OGYyNDJmOWMzMTJiNTc3ZS4uNGJkN2E5ZWIyMDcxNmQ2N2ZiMmNjZDAw MDBmNmU0NTU1OTA1YWI5OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2lu LmgKKysrIGIvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgKQEAgLTExOSw2ICsxMTksNyBA QCBwdWJsaWM6CiAgICAgYm9vbCBjYW5BY2Nlc3NEYXRhYmFzZSgpIGNvbnN0IHsgcmV0dXJuICFp c1VuaXF1ZSgpOyB9CiAgICAgYm9vbCBjYW5BY2Nlc3NMb2NhbFN0b3JhZ2UoKSBjb25zdCB7IHJl dHVybiAhaXNVbmlxdWUoKTsgfQogICAgIGJvb2wgY2FuQWNjZXNzQ29va2llcygpIGNvbnN0IHsg cmV0dXJuICFpc1VuaXF1ZSgpOyB9CisgICAgYm9vbCBjYW5BY2Nlc3NOb3RpZmljYXRpb25zKCkg Y29uc3QgeyByZXR1cm4gIWlzVW5pcXVlKCk7IH0KIAogICAgIGJvb2wgaXNTZWN1cmVUcmFuc2l0 aW9uVG8oY29uc3QgS1VSTCYpIGNvbnN0OwogCg== 54979 2010-05-03 17:30:26 -0700 2012-12-29 13:45:27 -0800 Patch bug-36732-20100503173025.patch text/plain 8336 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTY4NjJjYmE5OTBhN2Y2ZmU3ZTNhYTllNGNkYTMxNTYzOWFiYmU4MS4uNjYwNGRiNGExNGY5ZTYy YTg5OGNkMTNmNjRkMGM1ZWZkMzA5N2E2NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNS0wMyAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIHNhbmRib3hlZCBpZnJhbWVzIGZyb20gc2FtZSBvcmlnaW4g c2hvdWxkIG5vdCBiZSBncmFudGVkIG5vdGlmaWNhdGlvbiBwZXJtaXNzaW9uIG9mIHRoZSBwYXJl bnQgZnJhbWUgdW5sZXNzIGFsbG93LXNhbWUtb3JpZ2luIGlzIHNwZWNpZmllZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY3MzIKKworICAgICAgICBO byBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIG5vdGlmaWNhdGlvbnMvTm90aWZpY2F0 aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbjo6Tm90aWZpY2F0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbjo6YWxsb3dlZCk6CisgICAgICAgICogbm90 aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uaDoKKyAgICAgICAgKiBub3RpZmljYXRpb25zL05vdGlm aWNhdGlvbkNlbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25DZW50ZXI6 Ok5vdGlmaWNhdGlvbkNlbnRlcik6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25DZW50 ZXI6OmNoZWNrUGVybWlzc2lvbik6CisgICAgICAgICogbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRp b25DZW50ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbkNlbnRlcjo6Y3JlYXRl SFRNTE5vdGlmaWNhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb25DZW50ZXI6 OmNyZWF0ZU5vdGlmaWNhdGlvbik6CisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5oOgor ICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OmNhbkFjY2Vzc05vdGlmaWNhdGlvbnMp OgorCiAyMDEwLTA1LTAyICBEdW1pdHJ1IERhbmlsaXVjICA8ZHVtaUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbm90 aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uY3BwIGIvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlm aWNhdGlvbi5jcHAKaW5kZXggMTgyZjcxM2YzZmE0YzcxYjg3YTJhMzU3NjI0YjQ4OTk1MmQ2YTNk NS4uMDAyY2VhNjFhZTEzMzcxYmY4MjNhMjc5Y2M2NTNjMjcwMDkzNmU3MSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAKKysrIGIvV2ViQ29yZS9ub3Rp ZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAKQEAgLTQ5LDcgKzQ5LDcgQEAgTm90aWZpY2F0aW9u OjpOb3RpZmljYXRpb24oY29uc3QgS1VSTCYgdXJsLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBj b250ZXh0LCBFeGMKICAgICAsIG1fcHJlc2VudGVyKHByb3ZpZGVyKQogewogICAgIEFTU0VSVCht X3ByZXNlbnRlcik7Ci0gICAgaWYgKG1fcHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24oY29udGV4 dC0+dXJsKCkpICE9IE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkFsbG93ZWQpIHsK KyAgICBpZiAoIWFsbG93ZWQoKSkgewogICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KQEAgLTcwLDcgKzcwLDcgQEAgTm90aWZpY2F0aW9uOjpOb3RpZmlj YXRpb24oY29uc3QgTm90aWZpY2F0aW9uQ29udGVudHMmIGNvbnRlbnRzLCBTY3JpcHRFeGVjdXRp b24KICAgICAsIG1fcHJlc2VudGVyKHByb3ZpZGVyKQogewogICAgIEFTU0VSVChtX3ByZXNlbnRl cik7Ci0gICAgaWYgKG1fcHJlc2VudGVyLT5jaGVja1Blcm1pc3Npb24oY29udGV4dC0+dXJsKCkp ICE9IE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkFsbG93ZWQpIHsKKyAgICBpZiAo IWFsbG93ZWQoKSkgewogICAgICAgICBlYyA9IFNFQ1VSSVRZX0VSUjsKICAgICAgICAgcmV0dXJu OwogICAgIH0KQEAgLTg2LDYgKzg2LDExIEBAIE5vdGlmaWNhdGlvbjo6fk5vdGlmaWNhdGlvbigp CiAgICAgbV9wcmVzZW50ZXItPm5vdGlmaWNhdGlvbk9iamVjdERlc3Ryb3llZCh0aGlzKTsKIH0K IAorYm9vbCBOb3RpZmljYXRpb246OmFsbG93ZWQoKQoreworICAgIHJldHVybiBtX3ByZXNlbnRl ci0+Y2hlY2tQZXJtaXNzaW9uKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dXJsKCkpID09IE5v dGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkFsbG93ZWQ7Cit9CisKIHZvaWQgTm90aWZp Y2F0aW9uOjpzaG93KCkgCiB7CiAgICAgLy8gcHJldmVudCBkb3VibGUtc2hvd2luZwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5oIGIvV2ViQ29yZS9ub3Rp ZmljYXRpb25zL05vdGlmaWNhdGlvbi5oCmluZGV4IDk4Y2JmZGY5ZDY2NWM1YmU0ZDFmNjNjMWZm N2QwZjYxMWJhNjU5MzAuLjZjNzE5OWI1ZGY1YjQ2MzI2NzdlZjliMmM2Yjc2M2FkODUwNzg0MTIg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uaAorKysgYi9X ZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmgKQEAgLTUxLDE4ICs1MSwxNiBAQAog I2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAgY2xh c3MgV29ya2VyQ29udGV4dDsKLQogICAgIGNsYXNzIE5vdGlmaWNhdGlvbiA6IHB1YmxpYyBSZWZD b3VudGVkPE5vdGlmaWNhdGlvbj4sIHB1YmxpYyBBY3RpdmVET01PYmplY3QsIHB1YmxpYyBFdmVu dFRhcmdldCB7IAogICAgIHB1YmxpYzoKICAgICAgICAgc3RhdGljIE5vdGlmaWNhdGlvbiogY3Jl YXRlKGNvbnN0IEtVUkwmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgRXhj ZXB0aW9uQ29kZSYgZWMsIE5vdGlmaWNhdGlvblByZXNlbnRlciogcHJvdmlkZXIpIHsgcmV0dXJu IG5ldyBOb3RpZmljYXRpb24odXJsLCBjb250ZXh0LCBlYywgcHJvdmlkZXIpOyB9CiAgICAgICAg IHN0YXRpYyBOb3RpZmljYXRpb24qIGNyZWF0ZShjb25zdCBOb3RpZmljYXRpb25Db250ZW50cyYg Y29udGVudHMsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIEV4Y2VwdGlvbkNvZGUm IGVjLCBOb3RpZmljYXRpb25QcmVzZW50ZXIqIHByb3ZpZGVyKSB7IHJldHVybiBuZXcgTm90aWZp Y2F0aW9uKGNvbnRlbnRzLCBjb250ZXh0LCBlYywgcHJvdmlkZXIpOyB9Ci0gICAgICAgIAorCiAg ICAgICAgIHZpcnR1YWwgfk5vdGlmaWNhdGlvbigpOwogCiAgICAgICAgIHZvaWQgc2hvdygpOwog ICAgICAgICB2b2lkIGNhbmNlbCgpOwotICAgIAorCiAgICAgICAgIGJvb2wgaXNIVE1MKCkgeyBy ZXR1cm4gbV9pc0hUTUw7IH0KICAgICAgICAgS1VSTCB1cmwoKSB7IHJldHVybiBtX25vdGlmaWNh dGlvblVSTDsgfQogICAgICAgICBLVVJMIGljb25VUkwoKSB7IHJldHVybiBtX2NvbnRlbnRzLmlj b24oKTsgfQpAQCAtNzEsMTAgKzY5LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg REVGSU5FX0FUVFJJQlVURV9FVkVOVF9MSVNURU5FUihkaXNwbGF5KTsKICAgICAgICAgREVGSU5F X0FUVFJJQlVURV9FVkVOVF9MSVNURU5FUihlcnJvcik7CiAgICAgICAgIERFRklORV9BVFRSSUJV VEVfRVZFTlRfTElTVEVORVIoY2xvc2UpOwotICAgIAorCiAgICAgICAgIHVzaW5nIFJlZkNvdW50 ZWQ8Tm90aWZpY2F0aW9uPjo6cmVmOwogICAgICAgICB1c2luZyBSZWZDb3VudGVkPE5vdGlmaWNh dGlvbj46OmRlcmVmOwotICAgIAorCiAgICAgICAgIC8vIEV2ZW50VGFyZ2V0IGludGVyZmFjZQog ICAgICAgICB2aXJ0dWFsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKSBjb25zdCB7IHJldHVybiBBY3RpdmVET01PYmplY3Q6OnNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKTsgfQogICAgICAgICB2aXJ0dWFsIE5vdGlmaWNhdGlvbiogdG9Ob3RpZmljYXRpb24o KSB7IHJldHVybiB0aGlzOyB9CkBAIC04Myw2ICs4MSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgTm90aWZpY2F0aW9uKGNvbnN0IEtVUkwmLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgRXhjZXB0aW9uQ29kZSYsIE5vdGlmaWNhdGlvblByZXNlbnRlciopOwogICAgICAgICBOb3Rp ZmljYXRpb24oY29uc3QgTm90aWZpY2F0aW9uQ29udGVudHMmLCBTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiwgRXhjZXB0aW9uQ29kZSYsIE5vdGlmaWNhdGlvblByZXNlbnRlciopOwogCisgICAgICAg IGJvb2wgYWxsb3dlZCgpOworCiAgICAgICAgIC8vIEV2ZW50VGFyZ2V0IGludGVyZmFjZQogICAg ICAgICB2aXJ0dWFsIHZvaWQgcmVmRXZlbnRUYXJnZXQoKSB7IHJlZigpOyB9CiAgICAgICAgIHZp cnR1YWwgdm9pZCBkZXJlZkV2ZW50VGFyZ2V0KCkgeyBkZXJlZigpOyB9CkBAIC05Niw3ICs5Niw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX2lzU2hvd2luZzsKIAogICAg ICAgICBOb3RpZmljYXRpb25QcmVzZW50ZXIqIG1fcHJlc2VudGVyOwotICAgICAgICAKKwogICAg ICAgICBFdmVudFRhcmdldERhdGEgbV9ldmVudFRhcmdldERhdGE7CiAgICAgfTsKIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNlbnRlci5jcHAgYi9XZWJD b3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uQ2VudGVyLmNwcAppbmRleCA4MDg5ZDg3YmQx ODY1NmI4OTYxOTM0YzZiMTJmNGQwYWM1NGUyYmM0Li5lYTYwNWQxZTViMDU2NzIzZWQwNzNkOTI5 YzAzOWNiNTk0ZjI1NzBlIDEwMDY0NAotLS0gYS9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZp Y2F0aW9uQ2VudGVyLmNwcAorKysgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9u Q2VudGVyLmNwcApAQCAtNDIsMTAgKzQyLDE2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogTm90 aWZpY2F0aW9uQ2VudGVyOjpOb3RpZmljYXRpb25DZW50ZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCogY29udGV4dCwgTm90aWZpY2F0aW9uUHJlc2VudGVyKiBwcmVzZW50ZXIpCiAgICAgOiBBY3Rp dmVET01PYmplY3QoY29udGV4dCwgdGhpcykKLSAgICAsIG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4 dChjb250ZXh0KQotICAgICwgbV9ub3RpZmljYXRpb25QcmVzZW50ZXIocHJlc2VudGVyKSB7fQor ICAgICwgbV9ub3RpZmljYXRpb25QcmVzZW50ZXIocHJlc2VudGVyKQoreworICAgIGlmICghc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpLT5zZWN1cml0eU9yaWdpbigpLT5jYW5BY2Nlc3NOb3RpZmlj YXRpb25zKCkpIHsKKyAgICAgICAgLy8gSWYgdGhlIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQgY2Fu bm90IGFjY2VzcyBub3RpZmljYXRpb25zLCB3ZQorICAgICAgICAvLyBkaXNjb25uZWN0IGZyb20g dGhlIHByZXNlbnRlciB0byBhdm9pZCBwcmVzZW50aW5nIGFueSBub3RpZmljYXRpb25zLgorICAg ICAgICBtX25vdGlmaWNhdGlvblByZXNlbnRlciA9IDA7CisgICAgfQorfQogCi1pbnQgTm90aWZp Y2F0aW9uQ2VudGVyOjpjaGVja1Blcm1pc3Npb24oKQorUGVybWlzc2lvbiBOb3RpZmljYXRpb25D ZW50ZXI6OmNoZWNrUGVybWlzc2lvbigpCiB7CiAgICAgaWYgKCFwcmVzZW50ZXIoKSkKICAgICAg ICAgcmV0dXJuIE5vdGlmaWNhdGlvblByZXNlbnRlcjo6UGVybWlzc2lvbkRlbmllZDsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25DZW50ZXIuaCBiL1dlYkNv cmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb25DZW50ZXIuaAppbmRleCBhY2YxYWU1ZWUwNzI0 ZGNmNGRjY2Q0YzhiODQ5MmU4MTAwY2JkMmNmLi5mMDYwMDNkMTI4YmM2ZDY5Njk2ODQwYWRhYmFk ZTYxMGUxMjE4MDllIDEwMDY0NAotLS0gYS9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0 aW9uQ2VudGVyLmgKKysrIGIvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbkNlbnRl ci5oCkBAIC01OSw3ICs1OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICAg ICBlYyA9IFNZTlRBWF9FUlI7CiAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICByZXR1cm4gTm90aWZpY2F0aW9uOjpjcmVhdGUobV9zY3JpcHRFeGVj dXRpb25Db250ZXh0LT5jb21wbGV0ZVVSTChVUkkpLCBjb250ZXh0KCksIGVjLCBwcmVzZW50ZXIo KSk7CisgICAgICAgICAgICByZXR1cm4gTm90aWZpY2F0aW9uOjpjcmVhdGUoc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpLT5jb21wbGV0ZVVSTChVUkkpLCBjb250ZXh0KCksIGVjLCBwcmVzZW50ZXIo KSk7CiAgICAgICAgIH0KIAogICAgICAgICBOb3RpZmljYXRpb24qIGNyZWF0ZU5vdGlmaWNhdGlv bihjb25zdCBTdHJpbmcmIGljb25VUkksIGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmlu ZyYgYm9keSwgRXhjZXB0aW9uQ29kZSYgZWMpCkBAIC02OCwxNCArNjgsMTMgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICAgICAgICAgIGVjID0gSU5WQUxJRF9TVEFURV9FUlI7CiAgICAg ICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBOb3RpZmlj YXRpb25Db250ZW50cyBjb250ZW50cyhpY29uVVJJLmlzRW1wdHkoKSA/IEtVUkwoKSA6IG1fc2Ny aXB0RXhlY3V0aW9uQ29udGV4dC0+Y29tcGxldGVVUkwoaWNvblVSSSksIHRpdGxlLCBib2R5KTsK KyAgICAgICAgICAgIE5vdGlmaWNhdGlvbkNvbnRlbnRzIGNvbnRlbnRzKGljb25VUkkuaXNFbXB0 eSgpID8gS1VSTCgpIDogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5jb21wbGV0ZVVSTChpY29u VVJJKSwgdGl0bGUsIGJvZHkpOwogICAgICAgICAgICAgcmV0dXJuIE5vdGlmaWNhdGlvbjo6Y3Jl YXRlKGNvbnRlbnRzLCBjb250ZXh0KCksIGVjLCBwcmVzZW50ZXIoKSk7CiAgICAgICAgIH0KIAot ICAgICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0KCkgY29uc3QgeyByZXR1cm4g bV9zY3JpcHRFeGVjdXRpb25Db250ZXh0OyB9CiAgICAgICAgIE5vdGlmaWNhdGlvblByZXNlbnRl ciogcHJlc2VudGVyKCkgY29uc3QgeyByZXR1cm4gbV9ub3RpZmljYXRpb25QcmVzZW50ZXI7IH0K IAotICAgICAgICBpbnQgY2hlY2tQZXJtaXNzaW9uKCk7CisgICAgICAgIFBlcm1pc3Npb24gY2hl Y2tQZXJtaXNzaW9uKCk7CiAgICAgICAgIHZvaWQgcmVxdWVzdFBlcm1pc3Npb24oUGFzc1JlZlB0 cjxWb2lkQ2FsbGJhY2s+IGNhbGxiYWNrKTsKIAogICAgICAgICB2b2lkIGRpc2Nvbm5lY3RGcmFt ZSgpIHsgbV9ub3RpZmljYXRpb25QcmVzZW50ZXIgPSAwOyB9CkBAIC04Myw3ICs4Miw2IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICBwcml2YXRlOgogICAgICAgICBOb3RpZmljYXRpb25DZW50 ZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIE5vdGlmaWNhdGlvblByZXNlbnRlciopOwogCi0g ICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dDsK ICAgICAgICAgTm90aWZpY2F0aW9uUHJlc2VudGVyKiBtX25vdGlmaWNhdGlvblByZXNlbnRlcjsK ICAgICB9OwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uaCBiL1dl YkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCmluZGV4IGQ3MzI2NjQ3MGQ4N2MwNjIwOGEwNzA3 NzhmMjQyZjljMzEyYjU3N2UuLjRiZDdhOWViMjA3MTZkNjdmYjJjY2QwMDAwZjZlNDU1NTkwNWFi OTggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCisrKyBiL1dlYkNv cmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCkBAIC0xMTksNiArMTE5LDcgQEAgcHVibGljOgogICAg IGJvb2wgY2FuQWNjZXNzRGF0YWJhc2UoKSBjb25zdCB7IHJldHVybiAhaXNVbmlxdWUoKTsgfQog ICAgIGJvb2wgY2FuQWNjZXNzTG9jYWxTdG9yYWdlKCkgY29uc3QgeyByZXR1cm4gIWlzVW5pcXVl KCk7IH0KICAgICBib29sIGNhbkFjY2Vzc0Nvb2tpZXMoKSBjb25zdCB7IHJldHVybiAhaXNVbmlx dWUoKTsgfQorICAgIGJvb2wgY2FuQWNjZXNzTm90aWZpY2F0aW9ucygpIGNvbnN0IHsgcmV0dXJu ICFpc1VuaXF1ZSgpOyB9CiAKICAgICBib29sIGlzU2VjdXJlVHJhbnNpdGlvblRvKGNvbnN0IEtV UkwmKSBjb25zdDsKIAo= 180944 2012-12-29 13:45:31 -0800 2013-01-02 11:17:03 -0800 Patch bug-36732-20121229224241.patch text/plain 3733 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NTY4CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDg2ZTE4Nzk2ZDAxMGUzYjkxNmEy OTZlNmRhZTQ4ZDY3ODgxMWYxYS4uNDdjYWI4NzE2N2M5ODVjOTcwNTNjMDVlYmMxZWE1MjBlNjY2 MTQ5YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEyLTI5ICBNaWtlIFdlc3QgIDxta3dz dEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU2FuZGJveGVkIGlmcmFtZXMgc2hvdWxkIG5vdCBi ZSBncmFudGVkIG5vdGlmaWNhdGlvbiBwZXJtaXNzaW9uIG9mIHRoZSBwYXJlbnQgZnJhbWUgdW5s ZXNzIGFsbG93LXNhbWUtb3JpZ2luIGlzIHNwZWNpZmllZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY3MzIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYmVoYXZpb3Igd2FzIGZpeGVkIGluIHdrYnVn LmNvbS83OTcwNCwgYnV0IHRoZXJlIGFyZW4ndCBjdXJyZW50bHkKKyAgICAgICAgYW55IHRlc3Rz IGVuc3VyaW5nIHRoYXQgaXQgZG9lc24ndCByZWdyZXNzIGZvciBzYW5kYm94ZWQgZnJhbWVzLiBU aGlzCisgICAgICAgIHBhdGNoIGFkZHMgb25lLgorCisgICAgICAgICogZmFzdC9ub3RpZmljYXRp b25zL25vdGlmaWNhdGlvbnMtc2FuZGJveC1wZXJtaXNzaW9uLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogZmFzdC9ub3RpZmljYXRpb25zL25vdGlmaWNhdGlvbnMtc2FuZGJveC1wZXJt aXNzaW9uLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvbm90aWZpY2F0aW9ucy9yZXNvdXJj ZXMvbm90aWZpY2F0aW9ucy1pZnJhbWUuaHRtbDogQWRkZWQuCisKIDIwMTItMTItMjkgIFNlb2tq dSBLd29uICA8c2Vva2p1Lmt3b25AZ21haWwuY29tPgogCiAgICAgICAgIFtHVEtdIENoYW5nZSBi dWcgZm9yIHNvbWUgaW5zcGVjdG9yIHRlc3RzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L25vdGlmaWNhdGlvbnMvbm90aWZpY2F0aW9ucy1zYW5kYm94LXBlcm1pc3Npb24tZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9ub3RpZmljYXRpb25zL25vdGlmaWNhdGlvbnMtc2FuZGJv eC1wZXJtaXNzaW9uLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kNDFmNTZkZjQzMTRmMjY4NTZj Mjk3Njg1ZjhkYzU1MzI4ZmFiZjUzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9ub3RpZmljYXRpb25zL25vdGlmaWNhdGlvbnMtc2FuZGJveC1wZXJtaXNzaW9uLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDI0IEBACitOb3JtYWwgaWZyYW1lLiBTaG91bGQgaW5oZXJpdCBwZXJt aXNzaW9ucy4KKworCitTYW5kYm94ZWQgaWZyYW1lLCB3aXRoIGFsbG93LXNhbWUtb3JpZ2luLiBT aG91bGQgaW5oZXJpdCBwZXJtaXNzaW9ucy4KKworCitTYW5kYm94ZWQgaWZyYW1lLCB3aXRob3V0 IGFsbG93LXNhbWUtb3JpZ2luLiBTaG91bGQgbm90IGluaGVyaXQgcGVybWlzc2lvbnMuCisKKwor CistLS0tLS0tLQorRnJhbWU6ICc8IS0tZnJhbWVQYXRoIC8vPCEtLWZyYW1lMC0tPi0tPicKKy0t LS0tLS0tCitBbGxvd2VkCisKKy0tLS0tLS0tCitGcmFtZTogJzwhLS1mcmFtZVBhdGggLy88IS0t ZnJhbWUxLS0+LS0+JworLS0tLS0tLS0KK0FsbG93ZWQKKworLS0tLS0tLS0KK0ZyYW1lOiAnPCEt LWZyYW1lUGF0aCAvLzwhLS1mcmFtZTItLT4tLT4nCistLS0tLS0tLQorRGVuaWVkCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L25vdGlmaWNhdGlvbnMvbm90aWZpY2F0aW9ucy1zYW5kYm94 LXBlcm1pc3Npb24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvbm90aWZpY2F0aW9ucy9ub3RpZmlj YXRpb25zLXNhbmRib3gtcGVybWlzc2lvbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmYyOThkZmZiM2NmMGY4 OTBhOWEzNmEwZWI5MmMyNzMyZDdhMmQ5OTkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L25vdGlmaWNhdGlvbnMvbm90aWZpY2F0aW9ucy1zYW5kYm94LXBlcm1pc3Npb24uaHRt bApAQCAtMCwwICsxLDI0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAg PHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAgICAgICB0 ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIuZHVtcENoaWxk RnJhbWVzQXNUZXh0KCk7CisgICAgICAgICAgICB0ZXN0UnVubmVyLmdyYW50V2ViTm90aWZpY2F0 aW9uUGVybWlzc2lvbigiZmlsZTovLyIpOworICAgICAgICB9CisgICAgPC9zY3JpcHQ+Cis8L2hl YWQ+Cis8Ym9keT4KKyAgICA8cD5Ob3JtYWwgaWZyYW1lLiBTaG91bGQgaW5oZXJpdCBwZXJtaXNz aW9ucy48L3A+CisgICAgPGlmcmFtZSBzcmM9InJlc291cmNlcy9ub3RpZmljYXRpb25zLWlmcmFt ZS5odG1sIj48L2lmcmFtZT4KKworICAgIDxwPlNhbmRib3hlZCBpZnJhbWUsIHdpdGggYWxsb3ct c2FtZS1vcmlnaW4uIFNob3VsZCBpbmhlcml0IHBlcm1pc3Npb25zLjwvcD4KKyAgICA8aWZyYW1l IHNhbmRib3g9ImFsbG93LXNjcmlwdHMgYWxsb3ctc2FtZS1vcmlnaW4iCisgICAgICAgICAgICBz cmM9InJlc291cmNlcy9ub3RpZmljYXRpb25zLWlmcmFtZS5odG1sIj48L2lmcmFtZT4KKworICAg IDxwPlNhbmRib3hlZCBpZnJhbWUsIHdpdGhvdXQgYWxsb3ctc2FtZS1vcmlnaW4uIFNob3VsZCBu b3QgaW5oZXJpdCBwZXJtaXNzaW9ucy48L3A+CisgICAgPGlmcmFtZSBzYW5kYm94PSJhbGxvdy1z Y3JpcHRzIgorICAgICAgICAgICAgc3JjPSJyZXNvdXJjZXMvbm90aWZpY2F0aW9ucy1pZnJhbWUu aHRtbCI+PC9pZnJhbWU+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L25vdGlmaWNhdGlvbnMvcmVzb3VyY2VzL25vdGlmaWNhdGlvbnMtaWZyYW1lLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L25vdGlmaWNhdGlvbnMvcmVzb3VyY2VzL25vdGlmaWNhdGlvbnMt aWZyYW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzE5NjljMTliOTUxYjc1MDA2ZWE4ZGE1Y2YyZTFlNTQz OGUwNDdmMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvbm90aWZpY2F0aW9u cy9yZXNvdXJjZXMvbm90aWZpY2F0aW9ucy1pZnJhbWUuaHRtbApAQCAtMCwwICsxLDEzIEBACis8 IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHRpdGxlPk5vdGlmaWNhdGlvbnM6 IElmcmFtZSB0ZXN0LjwvdGl0bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8cCBpZD0iaGFzUGVy bWlzc2lvbiI+PC9wPgorICAgIDxzY3JpcHQ+CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJoYXNQZXJtaXNzaW9uIikuaW5uZXJUZXh0ID0KKyAgICAgICAgICAgICF3ZWJraXROb3Rp ZmljYXRpb25zLmNoZWNrUGVybWlzc2lvbigpID8gIkFsbG93ZWQiIDogIkRlbmllZCI7CisgICAg PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==