129611 2014-03-03 10:20:01 -0800 ScriptExecutionContext::vm() should return a reference. 2014-03-16 13:21:39 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling allan.jensen commit-queue esprehn+autocc glenn gyuyoung.kim kangil.han macpherson menard oldest_to_newest 986389 0 kling 2014-03-03 10:20:01 -0800 ScriptExecutionContext::vm() should return a reference. 986390 1 225666 kling 2014-03-03 10:20:25 -0800 Created attachment 225666 Patch 986396 2 225668 kling 2014-03-03 10:30:50 -0800 Created attachment 225668 Patch 986416 3 225673 kling 2014-03-03 11:07:57 -0800 Created attachment 225673 Patch 986479 4 225673 ggaren 2014-03-03 13:36:27 -0800 Comment on attachment 225673 Patch r=me Please fix Windows build. 991009 5 226851 kling 2014-03-16 12:28:46 -0700 Created attachment 226851 Patch 991010 6 226851 commit-queue 2014-03-16 12:29:49 -0700 Comment on attachment 226851 Patch Rejecting attachment 226851 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 226851, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Geoff Garen found in /Volumes/Data/EWS/WebKit/Source/WebCore/ChangeLog does not appear to be a valid reviewer according to contributors.json. /Volumes/Data/EWS/WebKit/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://webkit-queues.appspot.com/results/6737959357251584 991012 7 226852 kling 2014-03-16 12:42:41 -0700 Created attachment 226852 Geoffrey 991025 8 226852 commit-queue 2014-03-16 13:21:34 -0700 Comment on attachment 226852 Geoffrey Clearing flags on attachment: 226852 Committed r165710: <http://trac.webkit.org/changeset/165710> 991026 9 commit-queue 2014-03-16 13:21:39 -0700 All reviewed patches have been landed. Closing bug. 225666 2014-03-03 10:20:25 -0800 2014-03-03 10:30:50 -0800 Patch bug-129611.diff text/plain 8819 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwM2EzNDU1Li5iNzEzYjJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTQtMDMtMDMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnZtKCkgc2hvdWxkIHJldHVybiBhIHJlZmVyZW5j ZS4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTYxMT4KKworICAgICAgICBFdmVy eSBTY3JpcHRFeGVjdXRpb25Db250ZXh0IGhhcyBhIFZNLCBzbyB0aGlzIGNhbiBuZXZlciByZXR1 cm4gbnVsbC4KKyAgICAgICAgTWFkZSBXb3JrZXJTY3JpcHRDb250cm9sbGVyOjp2bSgpIHJldHVy biBhIHJlZmVyZW5jZSBhcyB3ZWxsLCBzaW5jZQorICAgICAgICB0aGF0IHdhcyBuZWVkZWQgZm9y IHRoaXMgY2hhbmdlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpXb3JrZXJTY3JpcHRDb250cm9sbGVyOjpXb3JrZXJTY3JpcHRDb250cm9sbGVy KToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmg6CisgICAg ICAgIChXZWJDb3JlOjpXb3JrZXJTY3JpcHRDb250cm9sbGVyOjp2bSk6CisgICAgICAgICogYmlu ZGluZ3MvanMvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 V29ya2VyU2NyaXB0RGVidWdTZXJ2ZXI6OnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKToKKyAgICAg ICAgKiBjc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxl bWVudFJ1bGVDb2xsZWN0b3I6OnJ1bGVNYXRjaGVzKToKKyAgICAgICAgKiBkb20vU2NyaXB0RXhl Y3V0aW9uQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRFeGVjdXRpb25Db250 ZXh0Ojp2bSk6CisgICAgICAgICogZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaDoKKyAgICAg ICAgKiBkb20vU2VsZWN0b3JRdWVyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckRh dGFMaXN0OjpleGVjdXRlKToKKyAgICAgICAgKiBodG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxDYW52YXNFbGVtZW50OjpjcmVhdGVJbWFnZUJ1ZmZlcik6 CisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhN TEh0dHBSZXF1ZXN0Ojpkcm9wUHJvdGVjdGlvbik6CisKIDIwMTQtMDItMjUgIEFuZHJlYXMgS2xp bmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIEpTRE9NV2luZG93Ojpjb21tb25WTSgp IHNob3VsZCByZXR1cm4gYSByZWZlcmVuY2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IDU3OWEwYjQuLmM5NDRj ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dvcmtlclNjcmlwdENv bnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dvcmtlclNjcmlw dENvbnRyb2xsZXIuY3BwCkBAIC01NSw3ICs1NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIFdv cmtlclNjcmlwdENvbnRyb2xsZXI6OldvcmtlclNjcmlwdENvbnRyb2xsZXIoV29ya2VyR2xvYmFs U2NvcGUqIHdvcmtlckdsb2JhbFNjb3BlKQogICAgIDogbV92bShWTTo6Y3JlYXRlKCkpCiAgICAg LCBtX3dvcmtlckdsb2JhbFNjb3BlKHdvcmtlckdsb2JhbFNjb3BlKQotICAgICwgbV93b3JrZXJH bG9iYWxTY29wZVdyYXBwZXIoKm1fdm0pCisgICAgLCBtX3dvcmtlckdsb2JhbFNjb3BlV3JhcHBl cihtX3ZtKQogICAgICwgbV9leGVjdXRpb25Gb3JiaWRkZW4oZmFsc2UpCiB7CiAgICAgaW5pdE5v cm1hbFdvcmxkQ2xpZW50RGF0YShtX3ZtLmdldCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIuaAppbmRleCAwMjVjMzdkLi45ZDQ5 YzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRD b250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0 Q29udHJvbGxlci5oCkBAIC03OSw3ICs3OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAg ICAgICB2b2lkIGRpc2FibGVFdmFsKGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKTsKIAotICAg ICAgICBKU0M6OlZNKiB2bSgpIHsgcmV0dXJuIG1fdm0uZ2V0KCk7IH0KKyAgICAgICAgSlNDOjpW TSYgdm0oKSB7IHJldHVybiAqbV92bTsgfQogCiAgICAgICAgIHZvaWQgYXR0YWNoRGVidWdnZXIo SlNDOjpEZWJ1Z2dlciopOwogICAgICAgICB2b2lkIGRldGFjaERlYnVnZ2VyKEpTQzo6RGVidWdn ZXIqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dvcmtlclNjcmlw dERlYnVnU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dvcmtlclNjcmlw dERlYnVnU2VydmVyLmNwcAppbmRleCA3NzU4ZGNiLi5iNWEzNTJiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHREZWJ1Z1NlcnZlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCkBA IC04NCwxMCArODQsMTAgQEAgdm9pZCBXb3JrZXJTY3JpcHREZWJ1Z1NlcnZlcjo6cmVtb3ZlTGlz dGVuZXIoU2NyaXB0RGVidWdMaXN0ZW5lciogbGlzdGVuZXIsIGJvb2wKIAogdm9pZCBXb3JrZXJT Y3JpcHREZWJ1Z1NlcnZlcjo6cmVjb21waWxlQWxsSlNGdW5jdGlvbnMoKQogewotICAgIEpTQzo6 Vk0qIHZtID0gbV93b3JrZXJHbG9iYWxTY29wZS0+c2NyaXB0KCktPnZtKCk7CisgICAgSlNDOjpW TSYgdm0gPSBtX3dvcmtlckdsb2JhbFNjb3BlLT5zY3JpcHQoKS0+dm0oKTsKIAogICAgIEpTQzo6 SlNMb2NrSG9sZGVyIGxvY2sodm0pOwotICAgIEpTQzo6RGVidWdnZXI6OnJlY29tcGlsZUFsbEpT RnVuY3Rpb25zKHZtKTsKKyAgICBKU0M6OkRlYnVnZ2VyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0aW9u cygmdm0pOwogfQogCiB2b2lkIFdvcmtlclNjcmlwdERlYnVnU2VydmVyOjpydW5FdmVudExvb3BX aGlsZVBhdXNlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVD b2xsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNw cAppbmRleCAyNmUzODIxLi5hMjVhMWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv RWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9FbGVtZW50 UnVsZUNvbGxlY3Rvci5jcHAKQEAgLTI4OCwxMCArMjg4LDEwIEBAIGlubGluZSBib29sIEVsZW1l bnRSdWxlQ29sbGVjdG9yOjpydWxlTWF0Y2hlcyhjb25zdCBSdWxlRGF0YSYgcnVsZURhdGEsIFBz ZXVkb0lkCiAjaWYgRU5BQkxFKENTU19TRUxFQ1RPUl9KSVQpCiAgICAgdm9pZCogY29tcGlsZWRT ZWxlY3RvckNoZWNrZXIgPSBydWxlRGF0YS5jb21waWxlZFNlbGVjdG9yQ29kZVJlZigpLmNvZGUo KS5leGVjdXRhYmxlQWRkcmVzcygpOwogICAgIGlmICghY29tcGlsZWRTZWxlY3RvckNoZWNrZXIg JiYgcnVsZURhdGEuY29tcGlsYXRpb25TdGF0dXMoKSA9PSBTZWxlY3RvckNvbXBpbGF0aW9uU3Rh dHVzOjpOb3RDb21waWxlZCkgewotICAgICAgICBKU0M6OlZNKiB2bSA9IG1fZWxlbWVudC5kb2N1 bWVudCgpLnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKTsKKyAgICAgICAgSlNDOjpWTSYg dm0gPSBtX2VsZW1lbnQuZG9jdW1lbnQoKS5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnZtKCk7 CiAgICAgICAgIFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXMgY29tcGlsYXRpb25TdGF0dXM7CiAg ICAgICAgIEpTQzo6TWFjcm9Bc3NlbWJsZXJDb2RlUmVmIGNvbXBpbGVkU2VsZWN0b3JDb2RlUmVm OwotICAgICAgICBjb21waWxhdGlvblN0YXR1cyA9IFNlbGVjdG9yQ29tcGlsZXI6OmNvbXBpbGVT ZWxlY3RvcihydWxlRGF0YS5zZWxlY3RvcigpLCB2bSwgU2VsZWN0b3JDb21waWxlcjo6U2VsZWN0 b3JDb250ZXh0OjpSdWxlQ29sbGVjdG9yLCBjb21waWxlZFNlbGVjdG9yQ29kZVJlZik7CisgICAg ICAgIGNvbXBpbGF0aW9uU3RhdHVzID0gU2VsZWN0b3JDb21waWxlcjo6Y29tcGlsZVNlbGVjdG9y KHJ1bGVEYXRhLnNlbGVjdG9yKCksICZ2bSwgU2VsZWN0b3JDb21waWxlcjo6U2VsZWN0b3JDb250 ZXh0OjpSdWxlQ29sbGVjdG9yLCBjb21waWxlZFNlbGVjdG9yQ29kZVJlZik7CiAKICAgICAgICAg cnVsZURhdGEuc2V0Q29tcGlsZWRTZWxlY3Rvcihjb21waWxhdGlvblN0YXR1cywgY29tcGlsZWRT ZWxlY3RvckNvZGVSZWYpOwogICAgICAgICBjb21waWxlZFNlbGVjdG9yQ2hlY2tlciA9IHJ1bGVE YXRhLmNvbXBpbGVkU2VsZWN0b3JDb2RlUmVmKCkuY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5jcHAKaW5kZXgg YzJjNGVkYy4uZTNjN2YzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4 ZWN1dGlvbkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRp b25Db250ZXh0LmNwcApAQCAtNDA1LDE2ICs0MDUsMTIgQEAgU2NyaXB0RXhlY3V0aW9uQ29udGV4 dDo6VGFzazo6flRhc2soKQogewogfQogCi1KU0M6OlZNKiBTY3JpcHRFeGVjdXRpb25Db250ZXh0 Ojp2bSgpCitKU0M6OlZNJiBTY3JpcHRFeGVjdXRpb25Db250ZXh0Ojp2bSgpCiB7CiAgICAgIGlm IChpc0RvY3VtZW50KCkpCi0gICAgICAgIHJldHVybiAmSlNET01XaW5kb3c6OmNvbW1vblZNKCk7 CisgICAgICAgIHJldHVybiBKU0RPTVdpbmRvdzo6Y29tbW9uVk0oKTsKIAotICAgIGlmIChpc1dv cmtlckdsb2JhbFNjb3BlKCkpCi0gICAgICAgIHJldHVybiB0b1dvcmtlckdsb2JhbFNjb3BlKHRo aXMpLT5zY3JpcHQoKS0+dm0oKTsKLQotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJl dHVybiAwOworICAgIHJldHVybiB0b1dvcmtlckdsb2JhbFNjb3BlKCp0aGlzKS5zY3JpcHQoKS0+ dm0oKTsKIH0KIAogI2lmIEVOQUJMRShTUUxfREFUQUJBU0UpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvZG9t L1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaAppbmRleCA2NGFjYWQ4Li4xYmM1NDRiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmgKQEAgLTE0Myw3ICsxNDMs NyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVUaW1lb3V0KGludCB0aW1lb3V0SWQpIHsgbV90 aW1lb3V0cy5yZW1vdmUodGltZW91dElkKTsgfQogICAgIERPTVRpbWVyKiBmaW5kVGltZW91dChp bnQgdGltZW91dElkKSB7IHJldHVybiBtX3RpbWVvdXRzLmdldCh0aW1lb3V0SWQpOyB9CiAKLSAg ICBKU0M6OlZNKiB2bSgpOworICAgIEpTQzo6Vk0mIHZtKCk7CiAKICAgICAvLyBJbnRlcnZhbCBp cyBpbiBzZWNvbmRzLgogICAgIHZvaWQgYWRqdXN0TWluaW11bVRpbWVySW50ZXJ2YWwoZG91Ymxl IG9sZE1pbmltdW1UaW1lckludGVydmFsKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9TZWxlY3RvclF1ZXJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNw cAppbmRleCA2NjM3YTUwLi44YjZmMWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v U2VsZWN0b3JRdWVyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnku Y3BwCkBAIC0zOTIsOCArMzkyLDggQEAgQUxXQVlTX0lOTElORSB2b2lkIFNlbGVjdG9yRGF0YUxp c3Q6OmV4ZWN1dGUoQ29udGFpbmVyTm9kZSYgcm9vdE5vZGUsIHR5cGVuYW1lIFMKICAgICAgICAg Y29uc3QgU2VsZWN0b3JEYXRhJiBzZWxlY3RvckRhdGEgPSBtX3NlbGVjdG9ycy5maXJzdCgpOwog ICAgICAgICBBU1NFUlQobV9tYXRjaFR5cGUgPT0gUmlnaHRNb3N0V2l0aElkTWF0Y2ggfHwgc2Vs ZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3RhdHVzID09IFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6 Ok5vdENvbXBpbGVkKTsKIAotICAgICAgICBKU0M6OlZNKiB2bSA9IHNlYXJjaFJvb3ROb2RlLT5k b2N1bWVudCgpLnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKTsKLSAgICAgICAgc2VsZWN0 b3JEYXRhLmNvbXBpbGF0aW9uU3RhdHVzID0gU2VsZWN0b3JDb21waWxlcjo6Y29tcGlsZVNlbGVj dG9yKHNlbGVjdG9yRGF0YS5zZWxlY3Rvciwgdm0sIFNlbGVjdG9yQ29tcGlsZXI6OlNlbGVjdG9y Q29udGV4dDo6UXVlcnlTZWxlY3Rvciwgc2VsZWN0b3JEYXRhLmNvbXBpbGVkU2VsZWN0b3JDb2Rl UmVmKTsKKyAgICAgICAgSlNDOjpWTSYgdm0gPSBzZWFyY2hSb290Tm9kZS0+ZG9jdW1lbnQoKS5z Y3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnZtKCk7CisgICAgICAgIHNlbGVjdG9yRGF0YS5jb21w aWxhdGlvblN0YXR1cyA9IFNlbGVjdG9yQ29tcGlsZXI6OmNvbXBpbGVTZWxlY3RvcihzZWxlY3Rv ckRhdGEuc2VsZWN0b3IsICZ2bSwgU2VsZWN0b3JDb21waWxlcjo6U2VsZWN0b3JDb250ZXh0OjpR dWVyeVNlbGVjdG9yLCBzZWxlY3RvckRhdGEuY29tcGlsZWRTZWxlY3RvckNvZGVSZWYpOwogICAg ICAgICBSRUxFQVNFX0FTU0VSVChzZWxlY3RvckRhdGEuY29tcGlsYXRpb25TdGF0dXMgIT0gU2Vs ZWN0b3JDb21waWxhdGlvblN0YXR1czo6U2VsZWN0b3JDaGVja2VyV2l0aENoZWNraW5nQ29udGV4 dCk7CiAKICAgICAgICAgaWYgKHNlbGVjdG9yRGF0YS5jb21waWxhdGlvblN0YXR1cyA9PSBTZWxl Y3RvckNvbXBpbGF0aW9uU3RhdHVzOjpTaW1wbGVTZWxlY3RvckNoZWNrZXIpIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKaW5kZXggMjE3MGYyMS4uNmE5MTNmMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKQEAgLTU5OCw3ICs1 OTgsNyBAQCB2b2lkIEhUTUxDYW52YXNFbGVtZW50OjpjcmVhdGVJbWFnZUJ1ZmZlcigpIGNvbnN0 CiAKICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+ dm0oKSk7CiAgICAgc2l6ZV90IG51bUJ5dGVzID0gNCAqIG1faW1hZ2VCdWZmZXItPmludGVybmFs U2l6ZSgpLndpZHRoKCkgKiBtX2ltYWdlQnVmZmVyLT5pbnRlcm5hbFNpemUoKS5oZWlnaHQoKTsK LSAgICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnZtKCktPmhlYXAucmVwb3J0RXh0cmFNZW1v cnlDb3N0KG51bUJ5dGVzKTsKKyAgICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnZtKCkuaGVh cC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QobnVtQnl0ZXMpOwogCiAjaWYgVVNFKElPU1VSRkFDRV9D QU5WQVNfQkFDS0lOR19TVE9SRSkgfHwgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICAg ICBpZiAobV9jb250ZXh0ICYmIG1fY29udGV4dC0+aXMyZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxI dHRwUmVxdWVzdC5jcHAKaW5kZXggNDU0MTgxNC4uOTU1MTgwMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwv WE1MSHR0cFJlcXVlc3QuY3BwCkBAIC05MzIsOSArOTMyLDkgQEAgdm9pZCBYTUxIdHRwUmVxdWVz dDo6ZHJvcFByb3RlY3Rpb24oKQogICAgIC8vIG91dC4gQnV0IGl0IGlzIHByb3RlY3RlZCBmcm9t IEdDIHdoaWxlIGxvYWRpbmcsIHNvIHRoaXMKICAgICAvLyBjYW4ndCBiZSByZWNvdXBlZCB1bnRp bCB0aGUgbG9hZCBpcyBkb25lLCBzbyBvbmx5CiAgICAgLy8gcmVwb3J0IHRoZSBleHRyYSBjb3N0 IGF0IHRoYXQgcG9pbnQuCi0gICAgSlNDOjpWTSogdm0gPSBzY3JpcHRFeGVjdXRpb25Db250ZXh0 KCktPnZtKCk7CisgICAgSlNDOjpWTSYgdm0gPSBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnZt KCk7CiAgICAgSlNDOjpKU0xvY2tIb2xkZXIgbG9jayh2bSk7Ci0gICAgdm0tPmhlYXAucmVwb3J0 RXh0cmFNZW1vcnlDb3N0KG1fcmVzcG9uc2VCdWlsZGVyLmxlbmd0aCgpICogMik7CisgICAgdm0u aGVhcC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QobV9yZXNwb25zZUJ1aWxkZXIubGVuZ3RoKCkgKiAy KTsKIAogICAgIHVuc2V0UGVuZGluZ0FjdGl2aXR5KHRoaXMpOwogfQo= 225668 2014-03-03 10:30:50 -0800 2014-03-03 11:07:57 -0800 Patch bug-129611-2.diff text/plain 8068 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwM2EzNDU1Li5lMDIwOWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTQtMDMtMDMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnZtKCkgc2hvdWxkIHJldHVybiBhIHJlZmVyZW5j ZS4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTYxMT4KKworICAgICAgICBFdmVy eSBTY3JpcHRFeGVjdXRpb25Db250ZXh0IGhhcyBhIFZNLCBzbyB0aGlzIGNhbiBuZXZlciByZXR1 cm4gbnVsbC4KKyAgICAgICAgTWFkZSBXb3JrZXJTY3JpcHRDb250cm9sbGVyOjp2bSgpIHJldHVy biBhIHJlZmVyZW5jZSBhcyB3ZWxsLCBzaW5jZQorICAgICAgICB0aGF0IHdhcyBuZWVkZWQgZm9y IHRoaXMgY2hhbmdlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5oOgorICAgICAgICAo V2ViQ29yZTo6V29ya2VyU2NyaXB0Q29udHJvbGxlcjo6dm0pOgorICAgICAgICAqIGJpbmRpbmdz L2pzL1dvcmtlclNjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oldvcmtl clNjcmlwdERlYnVnU2VydmVyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0aW9ucyk6CisgICAgICAgICog Y3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnRS dWxlQ29sbGVjdG9yOjpydWxlTWF0Y2hlcyk6CisgICAgICAgICogZG9tL1NjcmlwdEV4ZWN1dGlv bkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6 dm0pOgorICAgICAgICAqIGRvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0Lmg6CisgICAgICAgICog ZG9tL1NlbGVjdG9yUXVlcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JEYXRhTGlz dDo6ZXhlY3V0ZSk6CisgICAgICAgICogaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MQ2FudmFzRWxlbWVudDo6Y3JlYXRlSW1hZ2VCdWZmZXIpOgorICAg ICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRw UmVxdWVzdDo6ZHJvcFByb3RlY3Rpb24pOgorCiAyMDE0LTAyLTI1ICBBbmRyZWFzIEtsaW5nICA8 YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBKU0RPTVdpbmRvdzo6Y29tbW9uVk0oKSBzaG91 bGQgcmV0dXJuIGEgcmVmZXJlbmNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5oCmluZGV4IDAyNWMzN2QuLjlkNDljNTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRDb250cm9sbGVy LmgKQEAgLTc5LDcgKzc5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZvaWQg ZGlzYWJsZUV2YWwoY29uc3QgU3RyaW5nJiBlcnJvck1lc3NhZ2UpOwogCi0gICAgICAgIEpTQzo6 Vk0qIHZtKCkgeyByZXR1cm4gbV92bS5nZXQoKTsgfQorICAgICAgICBKU0M6OlZNJiB2bSgpIHsg cmV0dXJuICptX3ZtOyB9CiAKICAgICAgICAgdm9pZCBhdHRhY2hEZWJ1Z2dlcihKU0M6OkRlYnVn Z2VyKik7CiAgICAgICAgIHZvaWQgZGV0YWNoRGVidWdnZXIoSlNDOjpEZWJ1Z2dlciopOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0RGVidWdTZXJ2 ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0RGVidWdTZXJ2 ZXIuY3BwCmluZGV4IDc3NThkY2IuLmI1YTM1MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL1dvcmtlclNjcmlwdERlYnVnU2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHREZWJ1Z1NlcnZlci5jcHAKQEAgLTg0LDEwICs4 NCwxMCBAQCB2b2lkIFdvcmtlclNjcmlwdERlYnVnU2VydmVyOjpyZW1vdmVMaXN0ZW5lcihTY3Jp cHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5lciwgYm9vbAogCiB2b2lkIFdvcmtlclNjcmlwdERlYnVn U2VydmVyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0aW9ucygpCiB7Ci0gICAgSlNDOjpWTSogdm0gPSBt X3dvcmtlckdsb2JhbFNjb3BlLT5zY3JpcHQoKS0+dm0oKTsKKyAgICBKU0M6OlZNJiB2bSA9IG1f d29ya2VyR2xvYmFsU2NvcGUtPnNjcmlwdCgpLT52bSgpOwogCiAgICAgSlNDOjpKU0xvY2tIb2xk ZXIgbG9jayh2bSk7Ci0gICAgSlNDOjpEZWJ1Z2dlcjo6cmVjb21waWxlQWxsSlNGdW5jdGlvbnMo dm0pOworICAgIEpTQzo6RGVidWdnZXI6OnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKCZ2bSk7CiB9 CiAKIHZvaWQgV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXI6OnJ1bkV2ZW50TG9vcFdoaWxlUGF1c2Vk KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCmluZGV4IDI2 ZTM4MjEuLmEyNWExY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVs ZUNvbGxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29sbGVj dG9yLmNwcApAQCAtMjg4LDEwICsyODgsMTAgQEAgaW5saW5lIGJvb2wgRWxlbWVudFJ1bGVDb2xs ZWN0b3I6OnJ1bGVNYXRjaGVzKGNvbnN0IFJ1bGVEYXRhJiBydWxlRGF0YSwgUHNldWRvSWQKICNp ZiBFTkFCTEUoQ1NTX1NFTEVDVE9SX0pJVCkKICAgICB2b2lkKiBjb21waWxlZFNlbGVjdG9yQ2hl Y2tlciA9IHJ1bGVEYXRhLmNvbXBpbGVkU2VsZWN0b3JDb2RlUmVmKCkuY29kZSgpLmV4ZWN1dGFi bGVBZGRyZXNzKCk7CiAgICAgaWYgKCFjb21waWxlZFNlbGVjdG9yQ2hlY2tlciAmJiBydWxlRGF0 YS5jb21waWxhdGlvblN0YXR1cygpID09IFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6Ok5vdENv bXBpbGVkKSB7Ci0gICAgICAgIEpTQzo6Vk0qIHZtID0gbV9lbGVtZW50LmRvY3VtZW50KCkuc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpOworICAgICAgICBKU0M6OlZNJiB2bSA9IG1fZWxl bWVudC5kb2N1bWVudCgpLnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKTsKICAgICAgICAg U2VsZWN0b3JDb21waWxhdGlvblN0YXR1cyBjb21waWxhdGlvblN0YXR1czsKICAgICAgICAgSlND OjpNYWNyb0Fzc2VtYmxlckNvZGVSZWYgY29tcGlsZWRTZWxlY3RvckNvZGVSZWY7Ci0gICAgICAg IGNvbXBpbGF0aW9uU3RhdHVzID0gU2VsZWN0b3JDb21waWxlcjo6Y29tcGlsZVNlbGVjdG9yKHJ1 bGVEYXRhLnNlbGVjdG9yKCksIHZtLCBTZWxlY3RvckNvbXBpbGVyOjpTZWxlY3RvckNvbnRleHQ6 OlJ1bGVDb2xsZWN0b3IsIGNvbXBpbGVkU2VsZWN0b3JDb2RlUmVmKTsKKyAgICAgICAgY29tcGls YXRpb25TdGF0dXMgPSBTZWxlY3RvckNvbXBpbGVyOjpjb21waWxlU2VsZWN0b3IocnVsZURhdGEu c2VsZWN0b3IoKSwgJnZtLCBTZWxlY3RvckNvbXBpbGVyOjpTZWxlY3RvckNvbnRleHQ6OlJ1bGVD b2xsZWN0b3IsIGNvbXBpbGVkU2VsZWN0b3JDb2RlUmVmKTsKIAogICAgICAgICBydWxlRGF0YS5z ZXRDb21waWxlZFNlbGVjdG9yKGNvbXBpbGF0aW9uU3RhdHVzLCBjb21waWxlZFNlbGVjdG9yQ29k ZVJlZik7CiAgICAgICAgIGNvbXBpbGVkU2VsZWN0b3JDaGVja2VyID0gcnVsZURhdGEuY29tcGls ZWRTZWxlY3RvckNvZGVSZWYoKS5jb2RlKCkuZXhlY3V0YWJsZUFkZHJlc3MoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmNwcAppbmRleCBjMmM0ZWRjLi5l M2M3ZjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29u dGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQu Y3BwCkBAIC00MDUsMTYgKzQwNSwxMiBAQCBTY3JpcHRFeGVjdXRpb25Db250ZXh0OjpUYXNrOjp+ VGFzaygpCiB7CiB9CiAKLUpTQzo6Vk0qIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnZtKCkKK0pT Qzo6Vk0mIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnZtKCkKIHsKICAgICAgaWYgKGlzRG9jdW1l bnQoKSkKLSAgICAgICAgcmV0dXJuICZKU0RPTVdpbmRvdzo6Y29tbW9uVk0oKTsKKyAgICAgICAg cmV0dXJuIEpTRE9NV2luZG93Ojpjb21tb25WTSgpOwogCi0gICAgaWYgKGlzV29ya2VyR2xvYmFs U2NvcGUoKSkKLSAgICAgICAgcmV0dXJuIHRvV29ya2VyR2xvYmFsU2NvcGUodGhpcyktPnNjcmlw dCgpLT52bSgpOwotCi0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIDA7Cisg ICAgcmV0dXJuIHRvV29ya2VyR2xvYmFsU2NvcGUoKnRoaXMpLnNjcmlwdCgpLT52bSgpOwogfQog CiAjaWYgRU5BQkxFKFNRTF9EQVRBQkFTRSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhl Y3V0aW9uQ29udGV4dC5oCmluZGV4IDY0YWNhZDguLjFiYzU0NGIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaApAQCAtMTQzLDcgKzE0Myw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIHJlbW92ZVRpbWVvdXQoaW50IHRpbWVvdXRJZCkgeyBtX3RpbWVvdXRzLnJl bW92ZSh0aW1lb3V0SWQpOyB9CiAgICAgRE9NVGltZXIqIGZpbmRUaW1lb3V0KGludCB0aW1lb3V0 SWQpIHsgcmV0dXJuIG1fdGltZW91dHMuZ2V0KHRpbWVvdXRJZCk7IH0KIAotICAgIEpTQzo6Vk0q IHZtKCk7CisgICAgSlNDOjpWTSYgdm0oKTsKIAogICAgIC8vIEludGVydmFsIGlzIGluIHNlY29u ZHMuCiAgICAgdm9pZCBhZGp1c3RNaW5pbXVtVGltZXJJbnRlcnZhbChkb3VibGUgb2xkTWluaW11 bVRpbWVySW50ZXJ2YWwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9y UXVlcnkuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwCmluZGV4IDY2 MzdhNTAuLjhiNmYxZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1 ZXJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKQEAgLTM5 Miw4ICszOTIsOCBAQCBBTFdBWVNfSU5MSU5FIHZvaWQgU2VsZWN0b3JEYXRhTGlzdDo6ZXhlY3V0 ZShDb250YWluZXJOb2RlJiByb290Tm9kZSwgdHlwZW5hbWUgUwogICAgICAgICBjb25zdCBTZWxl Y3RvckRhdGEmIHNlbGVjdG9yRGF0YSA9IG1fc2VsZWN0b3JzLmZpcnN0KCk7CiAgICAgICAgIEFT U0VSVChtX21hdGNoVHlwZSA9PSBSaWdodE1vc3RXaXRoSWRNYXRjaCB8fCBzZWxlY3RvckRhdGEu Y29tcGlsYXRpb25TdGF0dXMgPT0gU2VsZWN0b3JDb21waWxhdGlvblN0YXR1czo6Tm90Q29tcGls ZWQpOwogCi0gICAgICAgIEpTQzo6Vk0qIHZtID0gc2VhcmNoUm9vdE5vZGUtPmRvY3VtZW50KCku c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpOwotICAgICAgICBzZWxlY3RvckRhdGEuY29t cGlsYXRpb25TdGF0dXMgPSBTZWxlY3RvckNvbXBpbGVyOjpjb21waWxlU2VsZWN0b3Ioc2VsZWN0 b3JEYXRhLnNlbGVjdG9yLCB2bSwgU2VsZWN0b3JDb21waWxlcjo6U2VsZWN0b3JDb250ZXh0OjpR dWVyeVNlbGVjdG9yLCBzZWxlY3RvckRhdGEuY29tcGlsZWRTZWxlY3RvckNvZGVSZWYpOworICAg ICAgICBKU0M6OlZNJiB2bSA9IHNlYXJjaFJvb3ROb2RlLT5kb2N1bWVudCgpLnNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKS0+dm0oKTsKKyAgICAgICAgc2VsZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3Rh dHVzID0gU2VsZWN0b3JDb21waWxlcjo6Y29tcGlsZVNlbGVjdG9yKHNlbGVjdG9yRGF0YS5zZWxl Y3RvciwgJnZtLCBTZWxlY3RvckNvbXBpbGVyOjpTZWxlY3RvckNvbnRleHQ6OlF1ZXJ5U2VsZWN0 b3IsIHNlbGVjdG9yRGF0YS5jb21waWxlZFNlbGVjdG9yQ29kZVJlZik7CiAgICAgICAgIFJFTEVB U0VfQVNTRVJUKHNlbGVjdG9yRGF0YS5jb21waWxhdGlvblN0YXR1cyAhPSBTZWxlY3RvckNvbXBp bGF0aW9uU3RhdHVzOjpTZWxlY3RvckNoZWNrZXJXaXRoQ2hlY2tpbmdDb250ZXh0KTsKIAogICAg ICAgICBpZiAoc2VsZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3RhdHVzID09IFNlbGVjdG9yQ29tcGls YXRpb25TdGF0dXM6OlNpbXBsZVNlbGVjdG9yQ2hlY2tlcikgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxDYW52YXNFbGVtZW50LmNwcAppbmRleCAyMTcwZjIxLi42YTkxM2YzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcApAQCAtNTk4LDcgKzU5OCw3IEBAIHZv aWQgSFRNTENhbnZhc0VsZW1lbnQ6OmNyZWF0ZUltYWdlQnVmZmVyKCkgY29uc3QKIAogICAgIEpT Qzo6SlNMb2NrSG9sZGVyIGxvY2soc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpKTsKICAg ICBzaXplX3QgbnVtQnl0ZXMgPSA0ICogbV9pbWFnZUJ1ZmZlci0+aW50ZXJuYWxTaXplKCkud2lk dGgoKSAqIG1faW1hZ2VCdWZmZXItPmludGVybmFsU2l6ZSgpLmhlaWdodCgpOwotICAgIHNjcmlw dEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKS0+aGVhcC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QobnVt Qnl0ZXMpOworICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKS5oZWFwLnJlcG9ydEV4 dHJhTWVtb3J5Q29zdChudW1CeXRlcyk7CiAKICNpZiBVU0UoSU9TVVJGQUNFX0NBTlZBU19CQUNL SU5HX1NUT1JFKSB8fCBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQogICAgIGlmIChtX2Nv bnRleHQgJiYgbV9jb250ZXh0LT5pczJkKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94 bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0 LmNwcAppbmRleCA0NTQxODE0Li45NTUxODAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94 bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVx dWVzdC5jcHAKQEAgLTkzMiw5ICs5MzIsOSBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0Ojpkcm9wUHJv dGVjdGlvbigpCiAgICAgLy8gb3V0LiBCdXQgaXQgaXMgcHJvdGVjdGVkIGZyb20gR0Mgd2hpbGUg bG9hZGluZywgc28gdGhpcwogICAgIC8vIGNhbid0IGJlIHJlY291cGVkIHVudGlsIHRoZSBsb2Fk IGlzIGRvbmUsIHNvIG9ubHkKICAgICAvLyByZXBvcnQgdGhlIGV4dHJhIGNvc3QgYXQgdGhhdCBw b2ludC4KLSAgICBKU0M6OlZNKiB2bSA9IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKTsK KyAgICBKU0M6OlZNJiB2bSA9IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKTsKICAgICBK U0M6OkpTTG9ja0hvbGRlciBsb2NrKHZtKTsKLSAgICB2bS0+aGVhcC5yZXBvcnRFeHRyYU1lbW9y eUNvc3QobV9yZXNwb25zZUJ1aWxkZXIubGVuZ3RoKCkgKiAyKTsKKyAgICB2bS5oZWFwLnJlcG9y dEV4dHJhTWVtb3J5Q29zdChtX3Jlc3BvbnNlQnVpbGRlci5sZW5ndGgoKSAqIDIpOwogCiAgICAg dW5zZXRQZW5kaW5nQWN0aXZpdHkodGhpcyk7CiB9Cg== 225673 2014-03-03 11:07:57 -0800 2014-03-16 12:28:46 -0700 Patch bug-129611-3.diff text/plain 8713 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwM2EzNDU1Li45MjM2MDEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTQtMDMtMDMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnZtKCkgc2hvdWxkIHJldHVybiBhIHJlZmVyZW5j ZS4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyOTYxMT4KKworICAgICAgICBFdmVy eSBTY3JpcHRFeGVjdXRpb25Db250ZXh0IGhhcyBhIFZNLCBzbyB0aGlzIGNhbiBuZXZlciByZXR1 cm4gbnVsbC4KKyAgICAgICAgTWFkZSBXb3JrZXJTY3JpcHRDb250cm9sbGVyOjp2bSgpIHJldHVy biBhIHJlZmVyZW5jZSBhcyB3ZWxsLCBzaW5jZQorICAgICAgICB0aGF0IHdhcyBuZWVkZWQgZm9y IHRoaXMgY2hhbmdlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5oOgorICAgICAgICAo V2ViQ29yZTo6V29ya2VyU2NyaXB0Q29udHJvbGxlcjo6dm0pOgorICAgICAgICAqIGJpbmRpbmdz L2pzL1dvcmtlclNjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oldvcmtl clNjcmlwdERlYnVnU2VydmVyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0aW9ucyk6CisgICAgICAgICog Y3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnRS dWxlQ29sbGVjdG9yOjpydWxlTWF0Y2hlcyk6CisgICAgICAgICogZG9tL1NjcmlwdEV4ZWN1dGlv bkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dDo6 dm0pOgorICAgICAgICAqIGRvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0Lmg6CisgICAgICAgICog ZG9tL1NlbGVjdG9yUXVlcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JEYXRhTGlz dDo6ZXhlY3V0ZSk6CisgICAgICAgICogaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MQ2FudmFzRWxlbWVudDo6Y3JlYXRlSW1hZ2VCdWZmZXIpOgorICAg ICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRw UmVxdWVzdDo6ZHJvcFByb3RlY3Rpb24pOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6cGFyc2VyTWV0YURhdGEpOgorCiAyMDE0 LTAyLTI1ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBKU0RP TVdpbmRvdzo6Y29tbW9uVk0oKSBzaG91bGQgcmV0dXJuIGEgcmVmZXJlbmNlLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5oIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5oCmluZGV4 IDAyNWMzN2QuLjlkNDljNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L1dvcmtlclNjcmlwdENvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmgKQEAgLTc5LDcgKzc5LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiAgICAgICAgIHZvaWQgZGlzYWJsZUV2YWwoY29uc3QgU3RyaW5nJiBlcnJvck1l c3NhZ2UpOwogCi0gICAgICAgIEpTQzo6Vk0qIHZtKCkgeyByZXR1cm4gbV92bS5nZXQoKTsgfQor ICAgICAgICBKU0M6OlZNJiB2bSgpIHsgcmV0dXJuICptX3ZtOyB9CiAKICAgICAgICAgdm9pZCBh dHRhY2hEZWJ1Z2dlcihKU0M6OkRlYnVnZ2VyKik7CiAgICAgICAgIHZvaWQgZGV0YWNoRGVidWdn ZXIoSlNDOjpEZWJ1Z2dlciopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCmluZGV4IDc3NThkY2IuLmI1YTM1MmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dvcmtlclNjcmlwdERlYnVnU2Vy dmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHREZWJ1 Z1NlcnZlci5jcHAKQEAgLTg0LDEwICs4NCwxMCBAQCB2b2lkIFdvcmtlclNjcmlwdERlYnVnU2Vy dmVyOjpyZW1vdmVMaXN0ZW5lcihTY3JpcHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5lciwgYm9vbAog CiB2b2lkIFdvcmtlclNjcmlwdERlYnVnU2VydmVyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0aW9ucygp CiB7Ci0gICAgSlNDOjpWTSogdm0gPSBtX3dvcmtlckdsb2JhbFNjb3BlLT5zY3JpcHQoKS0+dm0o KTsKKyAgICBKU0M6OlZNJiB2bSA9IG1fd29ya2VyR2xvYmFsU2NvcGUtPnNjcmlwdCgpLT52bSgp OwogCiAgICAgSlNDOjpKU0xvY2tIb2xkZXIgbG9jayh2bSk7Ci0gICAgSlNDOjpEZWJ1Z2dlcjo6 cmVjb21waWxlQWxsSlNGdW5jdGlvbnModm0pOworICAgIEpTQzo6RGVidWdnZXI6OnJlY29tcGls ZUFsbEpTRnVuY3Rpb25zKCZ2bSk7CiB9CiAKIHZvaWQgV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXI6 OnJ1bkV2ZW50TG9vcFdoaWxlUGF1c2VkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVudFJ1 bGVDb2xsZWN0b3IuY3BwCmluZGV4IDI2ZTM4MjEuLmEyNWExY2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcApAQCAtMjg4LDEwICsyODgsMTAgQEAgaW5s aW5lIGJvb2wgRWxlbWVudFJ1bGVDb2xsZWN0b3I6OnJ1bGVNYXRjaGVzKGNvbnN0IFJ1bGVEYXRh JiBydWxlRGF0YSwgUHNldWRvSWQKICNpZiBFTkFCTEUoQ1NTX1NFTEVDVE9SX0pJVCkKICAgICB2 b2lkKiBjb21waWxlZFNlbGVjdG9yQ2hlY2tlciA9IHJ1bGVEYXRhLmNvbXBpbGVkU2VsZWN0b3JD b2RlUmVmKCkuY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCk7CiAgICAgaWYgKCFjb21waWxlZFNl bGVjdG9yQ2hlY2tlciAmJiBydWxlRGF0YS5jb21waWxhdGlvblN0YXR1cygpID09IFNlbGVjdG9y Q29tcGlsYXRpb25TdGF0dXM6Ok5vdENvbXBpbGVkKSB7Ci0gICAgICAgIEpTQzo6Vk0qIHZtID0g bV9lbGVtZW50LmRvY3VtZW50KCkuc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpOworICAg ICAgICBKU0M6OlZNJiB2bSA9IG1fZWxlbWVudC5kb2N1bWVudCgpLnNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKS0+dm0oKTsKICAgICAgICAgU2VsZWN0b3JDb21waWxhdGlvblN0YXR1cyBjb21waWxh dGlvblN0YXR1czsKICAgICAgICAgSlNDOjpNYWNyb0Fzc2VtYmxlckNvZGVSZWYgY29tcGlsZWRT ZWxlY3RvckNvZGVSZWY7Ci0gICAgICAgIGNvbXBpbGF0aW9uU3RhdHVzID0gU2VsZWN0b3JDb21w aWxlcjo6Y29tcGlsZVNlbGVjdG9yKHJ1bGVEYXRhLnNlbGVjdG9yKCksIHZtLCBTZWxlY3RvckNv bXBpbGVyOjpTZWxlY3RvckNvbnRleHQ6OlJ1bGVDb2xsZWN0b3IsIGNvbXBpbGVkU2VsZWN0b3JD b2RlUmVmKTsKKyAgICAgICAgY29tcGlsYXRpb25TdGF0dXMgPSBTZWxlY3RvckNvbXBpbGVyOjpj b21waWxlU2VsZWN0b3IocnVsZURhdGEuc2VsZWN0b3IoKSwgJnZtLCBTZWxlY3RvckNvbXBpbGVy OjpTZWxlY3RvckNvbnRleHQ6OlJ1bGVDb2xsZWN0b3IsIGNvbXBpbGVkU2VsZWN0b3JDb2RlUmVm KTsKIAogICAgICAgICBydWxlRGF0YS5zZXRDb21waWxlZFNlbGVjdG9yKGNvbXBpbGF0aW9uU3Rh dHVzLCBjb21waWxlZFNlbGVjdG9yQ29kZVJlZik7CiAgICAgICAgIGNvbXBpbGVkU2VsZWN0b3JD aGVja2VyID0gcnVsZURhdGEuY29tcGlsZWRTZWxlY3RvckNvZGVSZWYoKS5jb2RlKCkuZXhlY3V0 YWJsZUFkZHJlc3MoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVj dXRpb25Db250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250 ZXh0LmNwcAppbmRleCBjMmM0ZWRjLi5lM2M3ZjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwCkBAIC00MDUsMTYgKzQwNSwxMiBAQCBTY3JpcHRF eGVjdXRpb25Db250ZXh0OjpUYXNrOjp+VGFzaygpCiB7CiB9CiAKLUpTQzo6Vk0qIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQ6OnZtKCkKK0pTQzo6Vk0mIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnZt KCkKIHsKICAgICAgaWYgKGlzRG9jdW1lbnQoKSkKLSAgICAgICAgcmV0dXJuICZKU0RPTVdpbmRv dzo6Y29tbW9uVk0oKTsKKyAgICAgICAgcmV0dXJuIEpTRE9NV2luZG93Ojpjb21tb25WTSgpOwog Ci0gICAgaWYgKGlzV29ya2VyR2xvYmFsU2NvcGUoKSkKLSAgICAgICAgcmV0dXJuIHRvV29ya2Vy R2xvYmFsU2NvcGUodGhpcyktPnNjcmlwdCgpLT52bSgpOwotCi0gICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHRvV29ya2VyR2xvYmFsU2NvcGUoKnRo aXMpLnNjcmlwdCgpLT52bSgpOwogfQogCiAjaWYgRU5BQkxFKFNRTF9EQVRBQkFTRSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oCmluZGV4IDY0YWNhZDguLjFi YzU0NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250 ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaApA QCAtMTQzLDcgKzE0Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZVRpbWVvdXQoaW50IHRp bWVvdXRJZCkgeyBtX3RpbWVvdXRzLnJlbW92ZSh0aW1lb3V0SWQpOyB9CiAgICAgRE9NVGltZXIq IGZpbmRUaW1lb3V0KGludCB0aW1lb3V0SWQpIHsgcmV0dXJuIG1fdGltZW91dHMuZ2V0KHRpbWVv dXRJZCk7IH0KIAotICAgIEpTQzo6Vk0qIHZtKCk7CisgICAgSlNDOjpWTSYgdm0oKTsKIAogICAg IC8vIEludGVydmFsIGlzIGluIHNlY29uZHMuCiAgICAgdm9pZCBhZGp1c3RNaW5pbXVtVGltZXJJ bnRlcnZhbChkb3VibGUgb2xkTWluaW11bVRpbWVySW50ZXJ2YWwpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1Nl bGVjdG9yUXVlcnkuY3BwCmluZGV4IDY2MzdhNTAuLjhiNmYxZmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v U2VsZWN0b3JRdWVyeS5jcHAKQEAgLTM5Miw4ICszOTIsOCBAQCBBTFdBWVNfSU5MSU5FIHZvaWQg U2VsZWN0b3JEYXRhTGlzdDo6ZXhlY3V0ZShDb250YWluZXJOb2RlJiByb290Tm9kZSwgdHlwZW5h bWUgUwogICAgICAgICBjb25zdCBTZWxlY3RvckRhdGEmIHNlbGVjdG9yRGF0YSA9IG1fc2VsZWN0 b3JzLmZpcnN0KCk7CiAgICAgICAgIEFTU0VSVChtX21hdGNoVHlwZSA9PSBSaWdodE1vc3RXaXRo SWRNYXRjaCB8fCBzZWxlY3RvckRhdGEuY29tcGlsYXRpb25TdGF0dXMgPT0gU2VsZWN0b3JDb21w aWxhdGlvblN0YXR1czo6Tm90Q29tcGlsZWQpOwogCi0gICAgICAgIEpTQzo6Vk0qIHZtID0gc2Vh cmNoUm9vdE5vZGUtPmRvY3VtZW50KCkuc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpOwot ICAgICAgICBzZWxlY3RvckRhdGEuY29tcGlsYXRpb25TdGF0dXMgPSBTZWxlY3RvckNvbXBpbGVy Ojpjb21waWxlU2VsZWN0b3Ioc2VsZWN0b3JEYXRhLnNlbGVjdG9yLCB2bSwgU2VsZWN0b3JDb21w aWxlcjo6U2VsZWN0b3JDb250ZXh0OjpRdWVyeVNlbGVjdG9yLCBzZWxlY3RvckRhdGEuY29tcGls ZWRTZWxlY3RvckNvZGVSZWYpOworICAgICAgICBKU0M6OlZNJiB2bSA9IHNlYXJjaFJvb3ROb2Rl LT5kb2N1bWVudCgpLnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKTsKKyAgICAgICAgc2Vs ZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3RhdHVzID0gU2VsZWN0b3JDb21waWxlcjo6Y29tcGlsZVNl bGVjdG9yKHNlbGVjdG9yRGF0YS5zZWxlY3RvciwgJnZtLCBTZWxlY3RvckNvbXBpbGVyOjpTZWxl Y3RvckNvbnRleHQ6OlF1ZXJ5U2VsZWN0b3IsIHNlbGVjdG9yRGF0YS5jb21waWxlZFNlbGVjdG9y Q29kZVJlZik7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHNlbGVjdG9yRGF0YS5jb21waWxhdGlv blN0YXR1cyAhPSBTZWxlY3RvckNvbXBpbGF0aW9uU3RhdHVzOjpTZWxlY3RvckNoZWNrZXJXaXRo Q2hlY2tpbmdDb250ZXh0KTsKIAogICAgICAgICBpZiAoc2VsZWN0b3JEYXRhLmNvbXBpbGF0aW9u U3RhdHVzID09IFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6OlNpbXBsZVNlbGVjdG9yQ2hlY2tl cikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAppbmRleCAyMTcw ZjIxLi42YTkxM2YzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNF bGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNw cApAQCAtNTk4LDcgKzU5OCw3IEBAIHZvaWQgSFRNTENhbnZhc0VsZW1lbnQ6OmNyZWF0ZUltYWdl QnVmZmVyKCkgY29uc3QKIAogICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2soc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpLT52bSgpKTsKICAgICBzaXplX3QgbnVtQnl0ZXMgPSA0ICogbV9pbWFnZUJ1 ZmZlci0+aW50ZXJuYWxTaXplKCkud2lkdGgoKSAqIG1faW1hZ2VCdWZmZXItPmludGVybmFsU2l6 ZSgpLmhlaWdodCgpOwotICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKS0+aGVhcC5y ZXBvcnRFeHRyYU1lbW9yeUNvc3QobnVtQnl0ZXMpOworICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKS0+dm0oKS5oZWFwLnJlcG9ydEV4dHJhTWVtb3J5Q29zdChudW1CeXRlcyk7CiAKICNpZiBV U0UoSU9TVVJGQUNFX0NBTlZBU19CQUNLSU5HX1NUT1JFKSB8fCBFTkFCTEUoQUNDRUxFUkFURURf MkRfQ0FOVkFTKQogICAgIGlmIChtX2NvbnRleHQgJiYgbV9jb250ZXh0LT5pczJkKCkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggMmFmMGEyMi4uOWJjYTc5ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtMTE5OCw4ICsxMTk4LDggQEAgcHJpdmF0 ZToKIAogU3RyaW5nIEludGVybmFsczo6cGFyc2VyTWV0YURhdGEoRGVwcmVjYXRlZDo6U2NyaXB0 VmFsdWUgdmFsdWUpCiB7Ci0gICAgSlNDOjpWTSogdm0gPSBjb250ZXh0RG9jdW1lbnQoKS0+dm0o KTsKLSAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IHZtLT50b3BDYWxsRnJhbWU7CisgICAgSlND OjpWTSYgdm0gPSBjb250ZXh0RG9jdW1lbnQoKS0+dm0oKTsKKyAgICBKU0M6OkV4ZWNTdGF0ZSog ZXhlYyA9IHZtLnRvcENhbGxGcmFtZTsKICAgICBKU0M6OkpTVmFsdWUgY29kZSA9IHZhbHVlLmpz VmFsdWUoKTsKICAgICBTY3JpcHRFeGVjdXRhYmxlKiBleGVjdXRhYmxlOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUv eG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRleCA0NTQxODE0Li45NTUxODAzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTkzMiw5ICs5MzIsOSBAQCB2b2lkIFhNTEh0 dHBSZXF1ZXN0Ojpkcm9wUHJvdGVjdGlvbigpCiAgICAgLy8gb3V0LiBCdXQgaXQgaXMgcHJvdGVj dGVkIGZyb20gR0Mgd2hpbGUgbG9hZGluZywgc28gdGhpcwogICAgIC8vIGNhbid0IGJlIHJlY291 cGVkIHVudGlsIHRoZSBsb2FkIGlzIGRvbmUsIHNvIG9ubHkKICAgICAvLyByZXBvcnQgdGhlIGV4 dHJhIGNvc3QgYXQgdGhhdCBwb2ludC4KLSAgICBKU0M6OlZNKiB2bSA9IHNjcmlwdEV4ZWN1dGlv bkNvbnRleHQoKS0+dm0oKTsKKyAgICBKU0M6OlZNJiB2bSA9IHNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKS0+dm0oKTsKICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKHZtKTsKLSAgICB2bS0+aGVh cC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QobV9yZXNwb25zZUJ1aWxkZXIubGVuZ3RoKCkgKiAyKTsK KyAgICB2bS5oZWFwLnJlcG9ydEV4dHJhTWVtb3J5Q29zdChtX3Jlc3BvbnNlQnVpbGRlci5sZW5n dGgoKSAqIDIpOwogCiAgICAgdW5zZXRQZW5kaW5nQWN0aXZpdHkodGhpcyk7CiB9Cg== 226851 2014-03-16 12:28:46 -0700 2014-03-16 12:42:41 -0700 Patch land-129611.diff text/plain 10338 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZWI0MzJlZi4uZWMzODEwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE0LTAzLTAzICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAg ICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0Ojp2bSgpIHNob3VsZCByZXR1cm4gYSByZWZlcmVu Y2UuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjk2MTE+CisKKyAgICAgICAgRXZl cnkgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCBoYXMgYSBWTSwgc28gdGhpcyBjYW4gbmV2ZXIgcmV0 dXJuIG51bGwuCisgICAgICAgIE1hZGUgV29ya2VyU2NyaXB0Q29udHJvbGxlcjo6dm0oKSByZXR1 cm4gYSByZWZlcmVuY2UgYXMgd2VsbCwgc2luY2UKKyAgICAgICAgdGhhdCB3YXMgbmVlZGVkIGZv ciB0aGlzIGNoYW5nZS4KKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KKworICAg ICAgICAqIGJpbmRpbmdzL2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIuaDoKKyAgICAgICAgKFdl YkNvcmU6OldvcmtlclNjcmlwdENvbnRyb2xsZXI6OnZtKToKKyAgICAgICAgKiBiaW5kaW5ncy9q cy9Xb3JrZXJTY3JpcHREZWJ1Z1NlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJT Y3JpcHREZWJ1Z1NlcnZlcjo6cmVjb21waWxlQWxsSlNGdW5jdGlvbnMpOgorICAgICAgICAqIGNz cy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50UnVs ZUNvbGxlY3Rvcjo6cnVsZU1hdGNoZXMpOgorICAgICAgICAqIGRvbS9TY3JpcHRFeGVjdXRpb25D b250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnZt KToKKyAgICAgICAgKiBkb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oOgorICAgICAgICAqIGRv bS9TZWxlY3RvclF1ZXJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yRGF0YUxpc3Q6 OmV4ZWN1dGUpOgorICAgICAgICAqIGh0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTENhbnZhc0VsZW1lbnQ6OmNyZWF0ZUltYWdlQnVmZmVyKToKKyAgICAg ICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJl cXVlc3Q6OmRyb3BQcm90ZWN0aW9uKToKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnBhcnNlck1ldGFEYXRhKToKKwogMjAxNC0w My0xNSAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcCBw dWxsaW5nIGluIEpTRE9NQmluZGluZy5oIHZpYSBKU0V2ZW50TGlzdGVuZXIuaApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5oIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5oCmluZGV4 IDAyNWMzN2QuLjlkNDljNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L1dvcmtlclNjcmlwdENvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmgKQEAgLTc5LDcgKzc5LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiAgICAgICAgIHZvaWQgZGlzYWJsZUV2YWwoY29uc3QgU3RyaW5nJiBlcnJvck1l c3NhZ2UpOwogCi0gICAgICAgIEpTQzo6Vk0qIHZtKCkgeyByZXR1cm4gbV92bS5nZXQoKTsgfQor ICAgICAgICBKU0M6OlZNJiB2bSgpIHsgcmV0dXJuICptX3ZtOyB9CiAKICAgICAgICAgdm9pZCBh dHRhY2hEZWJ1Z2dlcihKU0M6OkRlYnVnZ2VyKik7CiAgICAgICAgIHZvaWQgZGV0YWNoRGVidWdn ZXIoSlNDOjpEZWJ1Z2dlciopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCmluZGV4IDc3NThkY2IuLmI1YTM1MmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dvcmtlclNjcmlwdERlYnVnU2Vy dmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHREZWJ1 Z1NlcnZlci5jcHAKQEAgLTg0LDEwICs4NCwxMCBAQCB2b2lkIFdvcmtlclNjcmlwdERlYnVnU2Vy dmVyOjpyZW1vdmVMaXN0ZW5lcihTY3JpcHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5lciwgYm9vbAog CiB2b2lkIFdvcmtlclNjcmlwdERlYnVnU2VydmVyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0aW9ucygp CiB7Ci0gICAgSlNDOjpWTSogdm0gPSBtX3dvcmtlckdsb2JhbFNjb3BlLT5zY3JpcHQoKS0+dm0o KTsKKyAgICBKU0M6OlZNJiB2bSA9IG1fd29ya2VyR2xvYmFsU2NvcGUtPnNjcmlwdCgpLT52bSgp OwogCiAgICAgSlNDOjpKU0xvY2tIb2xkZXIgbG9jayh2bSk7Ci0gICAgSlNDOjpEZWJ1Z2dlcjo6 cmVjb21waWxlQWxsSlNGdW5jdGlvbnModm0pOworICAgIEpTQzo6RGVidWdnZXI6OnJlY29tcGls ZUFsbEpTRnVuY3Rpb25zKCZ2bSk7CiB9CiAKIHZvaWQgV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXI6 OnJ1bkV2ZW50TG9vcFdoaWxlUGF1c2VkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVudFJ1 bGVDb2xsZWN0b3IuY3BwCmluZGV4IDI2ZTM4MjEuLmEyNWExY2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcApAQCAtMjg4LDEwICsyODgsMTAgQEAgaW5s aW5lIGJvb2wgRWxlbWVudFJ1bGVDb2xsZWN0b3I6OnJ1bGVNYXRjaGVzKGNvbnN0IFJ1bGVEYXRh JiBydWxlRGF0YSwgUHNldWRvSWQKICNpZiBFTkFCTEUoQ1NTX1NFTEVDVE9SX0pJVCkKICAgICB2 b2lkKiBjb21waWxlZFNlbGVjdG9yQ2hlY2tlciA9IHJ1bGVEYXRhLmNvbXBpbGVkU2VsZWN0b3JD b2RlUmVmKCkuY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCk7CiAgICAgaWYgKCFjb21waWxlZFNl bGVjdG9yQ2hlY2tlciAmJiBydWxlRGF0YS5jb21waWxhdGlvblN0YXR1cygpID09IFNlbGVjdG9y Q29tcGlsYXRpb25TdGF0dXM6Ok5vdENvbXBpbGVkKSB7Ci0gICAgICAgIEpTQzo6Vk0qIHZtID0g bV9lbGVtZW50LmRvY3VtZW50KCkuc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpOworICAg ICAgICBKU0M6OlZNJiB2bSA9IG1fZWxlbWVudC5kb2N1bWVudCgpLnNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKS0+dm0oKTsKICAgICAgICAgU2VsZWN0b3JDb21waWxhdGlvblN0YXR1cyBjb21waWxh dGlvblN0YXR1czsKICAgICAgICAgSlNDOjpNYWNyb0Fzc2VtYmxlckNvZGVSZWYgY29tcGlsZWRT ZWxlY3RvckNvZGVSZWY7Ci0gICAgICAgIGNvbXBpbGF0aW9uU3RhdHVzID0gU2VsZWN0b3JDb21w aWxlcjo6Y29tcGlsZVNlbGVjdG9yKHJ1bGVEYXRhLnNlbGVjdG9yKCksIHZtLCBTZWxlY3RvckNv bXBpbGVyOjpTZWxlY3RvckNvbnRleHQ6OlJ1bGVDb2xsZWN0b3IsIGNvbXBpbGVkU2VsZWN0b3JD b2RlUmVmKTsKKyAgICAgICAgY29tcGlsYXRpb25TdGF0dXMgPSBTZWxlY3RvckNvbXBpbGVyOjpj b21waWxlU2VsZWN0b3IocnVsZURhdGEuc2VsZWN0b3IoKSwgJnZtLCBTZWxlY3RvckNvbXBpbGVy OjpTZWxlY3RvckNvbnRleHQ6OlJ1bGVDb2xsZWN0b3IsIGNvbXBpbGVkU2VsZWN0b3JDb2RlUmVm KTsKIAogICAgICAgICBydWxlRGF0YS5zZXRDb21waWxlZFNlbGVjdG9yKGNvbXBpbGF0aW9uU3Rh dHVzLCBjb21waWxlZFNlbGVjdG9yQ29kZVJlZik7CiAgICAgICAgIGNvbXBpbGVkU2VsZWN0b3JD aGVja2VyID0gcnVsZURhdGEuY29tcGlsZWRTZWxlY3RvckNvZGVSZWYoKS5jb2RlKCkuZXhlY3V0 YWJsZUFkZHJlc3MoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVj dXRpb25Db250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250 ZXh0LmNwcAppbmRleCBmOGIwYmQ5Li4yNTk5OWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwCkBAIC00MDMsMTYgKzQwMywxMiBAQCBTY3JpcHRF eGVjdXRpb25Db250ZXh0OjpUYXNrOjp+VGFzaygpCiB7CiB9CiAKLUpTQzo6Vk0qIFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQ6OnZtKCkKK0pTQzo6Vk0mIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OnZt KCkKIHsKICAgICAgaWYgKGlzRG9jdW1lbnQoKSkKLSAgICAgICAgcmV0dXJuICZKU0RPTVdpbmRv dzo6Y29tbW9uVk0oKTsKKyAgICAgICAgcmV0dXJuIEpTRE9NV2luZG93Ojpjb21tb25WTSgpOwog Ci0gICAgaWYgKGlzV29ya2VyR2xvYmFsU2NvcGUoKSkKLSAgICAgICAgcmV0dXJuIHRvV29ya2Vy R2xvYmFsU2NvcGUodGhpcyktPnNjcmlwdCgpLT52bSgpOwotCi0gICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHRvV29ya2VyR2xvYmFsU2NvcGUoKnRo aXMpLnNjcmlwdCgpLT52bSgpOwogfQogCiAjaWYgRU5BQkxFKFNRTF9EQVRBQkFTRSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oCmluZGV4IDI5ODFjNTAuLjky ZTE0YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250 ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaApA QCAtMTQzLDcgKzE0Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZVRpbWVvdXQoaW50IHRp bWVvdXRJZCkgeyBtX3RpbWVvdXRzLnJlbW92ZSh0aW1lb3V0SWQpOyB9CiAgICAgRE9NVGltZXIq IGZpbmRUaW1lb3V0KGludCB0aW1lb3V0SWQpIHsgcmV0dXJuIG1fdGltZW91dHMuZ2V0KHRpbWVv dXRJZCk7IH0KIAotICAgIEpTQzo6Vk0qIHZtKCk7CisgICAgSlNDOjpWTSYgdm0oKTsKIAogICAg IC8vIEludGVydmFsIGlzIGluIHNlY29uZHMuCiAgICAgdm9pZCBhZGp1c3RNaW5pbXVtVGltZXJJ bnRlcnZhbChkb3VibGUgb2xkTWluaW11bVRpbWVySW50ZXJ2YWwpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1Nl bGVjdG9yUXVlcnkuY3BwCmluZGV4IDliYzBhODMuLjJmOTc4YjIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v U2VsZWN0b3JRdWVyeS5jcHAKQEAgLTM5OSw4ICszOTksOCBAQCBBTFdBWVNfSU5MSU5FIHZvaWQg U2VsZWN0b3JEYXRhTGlzdDo6ZXhlY3V0ZShDb250YWluZXJOb2RlJiByb290Tm9kZSwgdHlwZW5h bWUgUwogICAgICAgICBjb25zdCBTZWxlY3RvckRhdGEmIHNlbGVjdG9yRGF0YSA9IG1fc2VsZWN0 b3JzLmZpcnN0KCk7CiAgICAgICAgIEFTU0VSVChtX21hdGNoVHlwZSA9PSBSaWdodE1vc3RXaXRo SWRNYXRjaCB8fCBzZWxlY3RvckRhdGEuY29tcGlsYXRpb25TdGF0dXMgPT0gU2VsZWN0b3JDb21w aWxhdGlvblN0YXR1czo6Tm90Q29tcGlsZWQpOwogCi0gICAgICAgIEpTQzo6Vk0qIHZtID0gc2Vh cmNoUm9vdE5vZGUtPmRvY3VtZW50KCkuc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpOwot ICAgICAgICBzZWxlY3RvckRhdGEuY29tcGlsYXRpb25TdGF0dXMgPSBTZWxlY3RvckNvbXBpbGVy Ojpjb21waWxlU2VsZWN0b3Ioc2VsZWN0b3JEYXRhLnNlbGVjdG9yLCB2bSwgU2VsZWN0b3JDb21w aWxlcjo6U2VsZWN0b3JDb250ZXh0OjpRdWVyeVNlbGVjdG9yLCBzZWxlY3RvckRhdGEuY29tcGls ZWRTZWxlY3RvckNvZGVSZWYpOworICAgICAgICBKU0M6OlZNJiB2bSA9IHNlYXJjaFJvb3ROb2Rl LT5kb2N1bWVudCgpLnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKTsKKyAgICAgICAgc2Vs ZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3RhdHVzID0gU2VsZWN0b3JDb21waWxlcjo6Y29tcGlsZVNl bGVjdG9yKHNlbGVjdG9yRGF0YS5zZWxlY3RvciwgJnZtLCBTZWxlY3RvckNvbXBpbGVyOjpTZWxl Y3RvckNvbnRleHQ6OlF1ZXJ5U2VsZWN0b3IsIHNlbGVjdG9yRGF0YS5jb21waWxlZFNlbGVjdG9y Q29kZVJlZik7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHNlbGVjdG9yRGF0YS5jb21waWxhdGlv blN0YXR1cyAhPSBTZWxlY3RvckNvbXBpbGF0aW9uU3RhdHVzOjpTZWxlY3RvckNoZWNrZXJXaXRo Q2hlY2tpbmdDb250ZXh0KTsKIAogICAgICAgICBpZiAoc2VsZWN0b3JEYXRhLmNvbXBpbGF0aW9u U3RhdHVzID09IFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6OlNpbXBsZVNlbGVjdG9yQ2hlY2tl cikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAppbmRleCA5YWIx YjBkLi5mZTkxZmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNF bGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNw cApAQCAtNTk4LDcgKzU5OCw3IEBAIHZvaWQgSFRNTENhbnZhc0VsZW1lbnQ6OmNyZWF0ZUltYWdl QnVmZmVyKCkgY29uc3QKIAogICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2soc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpLT52bSgpKTsKICAgICBzaXplX3QgbnVtQnl0ZXMgPSA0ICogbV9pbWFnZUJ1 ZmZlci0+aW50ZXJuYWxTaXplKCkud2lkdGgoKSAqIG1faW1hZ2VCdWZmZXItPmludGVybmFsU2l6 ZSgpLmhlaWdodCgpOwotICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKS0+aGVhcC5y ZXBvcnRFeHRyYU1lbW9yeUNvc3QobnVtQnl0ZXMpOworICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKS0+dm0oKS5oZWFwLnJlcG9ydEV4dHJhTWVtb3J5Q29zdChudW1CeXRlcyk7CiAKICNpZiBV U0UoSU9TVVJGQUNFX0NBTlZBU19CQUNLSU5HX1NUT1JFKSB8fCBFTkFCTEUoQUNDRUxFUkFURURf MkRfQ0FOVkFTKQogICAgIGlmIChtX2NvbnRleHQgJiYgbV9jb250ZXh0LT5pczJkKCkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggNDExYWJhMy4uMWUyYmRhZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtMTE5OCw4ICsxMTk4LDggQEAgcHJpdmF0 ZToKIAogU3RyaW5nIEludGVybmFsczo6cGFyc2VyTWV0YURhdGEoRGVwcmVjYXRlZDo6U2NyaXB0 VmFsdWUgdmFsdWUpCiB7Ci0gICAgSlNDOjpWTSogdm0gPSBjb250ZXh0RG9jdW1lbnQoKS0+dm0o KTsKLSAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IHZtLT50b3BDYWxsRnJhbWU7CisgICAgSlND OjpWTSYgdm0gPSBjb250ZXh0RG9jdW1lbnQoKS0+dm0oKTsKKyAgICBKU0M6OkV4ZWNTdGF0ZSog ZXhlYyA9IHZtLnRvcENhbGxGcmFtZTsKICAgICBKU0M6OkpTVmFsdWUgY29kZSA9IHZhbHVlLmpz VmFsdWUoKTsKICAgICBTY3JpcHRFeGVjdXRhYmxlKiBleGVjdXRhYmxlOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUv eG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRleCAzNTFmMTg1Li5lM2RlNDZkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTkzMiw5ICs5MzIsOSBAQCB2b2lkIFhNTEh0 dHBSZXF1ZXN0Ojpkcm9wUHJvdGVjdGlvbigpCiAgICAgLy8gb3V0LiBCdXQgaXQgaXMgcHJvdGVj dGVkIGZyb20gR0Mgd2hpbGUgbG9hZGluZywgc28gdGhpcwogICAgIC8vIGNhbid0IGJlIHJlY291 cGVkIHVudGlsIHRoZSBsb2FkIGlzIGRvbmUsIHNvIG9ubHkKICAgICAvLyByZXBvcnQgdGhlIGV4 dHJhIGNvc3QgYXQgdGhhdCBwb2ludC4KLSAgICBKU0M6OlZNKiB2bSA9IHNjcmlwdEV4ZWN1dGlv bkNvbnRleHQoKS0+dm0oKTsKKyAgICBKU0M6OlZNJiB2bSA9IHNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKS0+dm0oKTsKICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKHZtKTsKLSAgICB2bS0+aGVh cC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QobV9yZXNwb25zZUJ1aWxkZXIubGVuZ3RoKCkgKiAyKTsK KyAgICB2bS5oZWFwLnJlcG9ydEV4dHJhTWVtb3J5Q29zdChtX3Jlc3BvbnNlQnVpbGRlci5sZW5n dGgoKSAqIDIpOwogCiAgICAgdW5zZXRQZW5kaW5nQWN0aXZpdHkodGhpcyk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdEV4cG9ydEdlbmVyYXRvci9X ZWJLaXRFeHBvcnRzLmRlZi5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0 RXhwb3J0R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluCmluZGV4IDc2MGI5MGIuLjNlMWVj NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0RXhwb3J0 R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0 LnZjeHByb2ovV2ViS2l0RXhwb3J0R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluCkBAIC00 NzEsNyArNDcxLDcgQEAgRVhQT1JUUwogICAgICAgICBzeW1ib2xXaXRoUG9pbnRlcig/c3RvcmVV cGRhdGVkUXVvdGFGb3JPcmlnaW5AQXBwbGljYXRpb25DYWNoZVN0b3JhZ2VAV2ViQ29yZUBAUUFF X05QQlZTZWN1cml0eU9yaWdpbkAyQF9KQFosID9zdG9yZVVwZGF0ZWRRdW90YUZvck9yaWdpbkBB cHBsaWNhdGlvbkNhY2hlU3RvcmFnZUBXZWJDb3JlQEBRRUFBX05QRUJWU2VjdXJpdHlPcmlnaW5A MkBfSkBaKQogICAgICAgICBzeW1ib2xXaXRoUG9pbnRlcig/Y2FjaGVTdG9yYWdlQFdlYkNvcmVA QFlBQUFWQXBwbGljYXRpb25DYWNoZVN0b3JhZ2VAMUBYWiwgP2NhY2hlU3RvcmFnZUBXZWJDb3Jl QEBZQUFFQVZBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZUAxQFhaKQogICAgICAgICBzeW1ib2xXaXRo UG9pbnRlcig/c2V0RGVmYXVsdE9yaWdpblF1b3RhQEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlQFdl YkNvcmVAQFFBRVhfSkBaLCA/c2V0RGVmYXVsdE9yaWdpblF1b3RhQEFwcGxpY2F0aW9uQ2FjaGVT dG9yYWdlQFdlYkNvcmVAQFFFQUFYX0pAWikKLSAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP3Zt QFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRAV2ViQ29yZUBAUUFFUEFWVk1ASlNDQEBYWiwgP3ZtQFNj cmlwdEV4ZWN1dGlvbkNvbnRleHRAV2ViQ29yZUBAUUVBQVBFQVZWTUBKU0NAQFhaKQorICAgICAg ICBzeW1ib2xXaXRoUG9pbnRlcig/dm1AU2NyaXB0RXhlY3V0aW9uQ29udGV4dEBXZWJDb3JlQEBR QUVBQVZWTUBKU0NAQFhaLCA/dm1AU2NyaXB0RXhlY3V0aW9uQ29udGV4dEBXZWJDb3JlQEBRRUFB QUVBVlZNQEpTQ0BAWFopCiAgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD9jb21wbGV0ZVVSTEBE b2N1bWVudEBXZWJDb3JlQEBVQkU/QVZVUkxAMkBBQlZTdHJpbmdAV1RGQEBAWiwgP2NvbXBsZXRl VVJMQERvY3VtZW50QFdlYkNvcmVAQFVFQkE/QVZVUkxAMkBBRUJWU3RyaW5nQFdURkBAQFopCiAg ICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD8/MURPTVdpbmRvd0BXZWJDb3JlQEBVQUVAWFosID8/ MURPTVdpbmRvd0BXZWJDb3JlQEBVRUFBQFhaKQogICAgICAgICBzeW1ib2xXaXRoUG9pbnRlcig/ dmlzaWJsZUNvbnRlbnRSZWN0QFNjcm9sbGFibGVBcmVhQFdlYkNvcmVAQFFCRT9BVkludFJlY3RA MkBXNFZpc2libGVDb250ZW50UmVjdEJlaGF2aW9yQDEyQEBaLCA/dmlzaWJsZUNvbnRlbnRSZWN0 QFNjcm9sbGFibGVBcmVhQFdlYkNvcmVAQFFFQkE/QVZJbnRSZWN0QDJAVzRWaXNpYmxlQ29udGVu dFJlY3RCZWhhdmlvckAxMkBAWikK 226852 2014-03-16 12:42:41 -0700 2014-03-16 13:21:34 -0700 Geoffrey land-129611.diff text/plain 10341 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZWI0MzJlZi4uMjA5YWNiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE0LTAzLTAzICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAg ICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0Ojp2bSgpIHNob3VsZCByZXR1cm4gYSByZWZlcmVu Y2UuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjk2MTE+CisKKyAgICAgICAgRXZl cnkgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCBoYXMgYSBWTSwgc28gdGhpcyBjYW4gbmV2ZXIgcmV0 dXJuIG51bGwuCisgICAgICAgIE1hZGUgV29ya2VyU2NyaXB0Q29udHJvbGxlcjo6dm0oKSByZXR1 cm4gYSByZWZlcmVuY2UgYXMgd2VsbCwgc2luY2UKKyAgICAgICAgdGhhdCB3YXMgbmVlZGVkIGZv ciB0aGlzIGNoYW5nZS4KKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4KKwor ICAgICAgICAqIGJpbmRpbmdzL2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIuaDoKKyAgICAgICAg KFdlYkNvcmU6OldvcmtlclNjcmlwdENvbnRyb2xsZXI6OnZtKToKKyAgICAgICAgKiBiaW5kaW5n cy9qcy9Xb3JrZXJTY3JpcHREZWJ1Z1NlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3Jr ZXJTY3JpcHREZWJ1Z1NlcnZlcjo6cmVjb21waWxlQWxsSlNGdW5jdGlvbnMpOgorICAgICAgICAq IGNzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50 UnVsZUNvbGxlY3Rvcjo6cnVsZU1hdGNoZXMpOgorICAgICAgICAqIGRvbS9TY3JpcHRFeGVjdXRp b25Db250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6 OnZtKToKKyAgICAgICAgKiBkb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oOgorICAgICAgICAq IGRvbS9TZWxlY3RvclF1ZXJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yRGF0YUxp c3Q6OmV4ZWN1dGUpOgorICAgICAgICAqIGh0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTENhbnZhc0VsZW1lbnQ6OmNyZWF0ZUltYWdlQnVmZmVyKToKKyAg ICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0 cFJlcXVlc3Q6OmRyb3BQcm90ZWN0aW9uKToKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnBhcnNlck1ldGFEYXRhKToKKwogMjAx NC0wMy0xNSAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgU3Rv cCBwdWxsaW5nIGluIEpTRE9NQmluZGluZy5oIHZpYSBKU0V2ZW50TGlzdGVuZXIuaApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5o IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvV29ya2VyU2NyaXB0Q29udHJvbGxlci5oCmlu ZGV4IDAyNWMzN2QuLjlkNDljNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL1dvcmtlclNjcmlwdENvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmgKQEAgLTc5LDcgKzc5LDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogCiAgICAgICAgIHZvaWQgZGlzYWJsZUV2YWwoY29uc3QgU3RyaW5nJiBlcnJv ck1lc3NhZ2UpOwogCi0gICAgICAgIEpTQzo6Vk0qIHZtKCkgeyByZXR1cm4gbV92bS5nZXQoKTsg fQorICAgICAgICBKU0M6OlZNJiB2bSgpIHsgcmV0dXJuICptX3ZtOyB9CiAKICAgICAgICAgdm9p ZCBhdHRhY2hEZWJ1Z2dlcihKU0M6OkRlYnVnZ2VyKik7CiAgICAgICAgIHZvaWQgZGV0YWNoRGVi dWdnZXIoSlNDOjpEZWJ1Z2dlciopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvV29ya2VyU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCmluZGV4IDc3NThkY2IuLmI1YTM1MmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1dvcmtlclNjcmlwdERlYnVn U2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9Xb3JrZXJTY3JpcHRE ZWJ1Z1NlcnZlci5jcHAKQEAgLTg0LDEwICs4NCwxMCBAQCB2b2lkIFdvcmtlclNjcmlwdERlYnVn U2VydmVyOjpyZW1vdmVMaXN0ZW5lcihTY3JpcHREZWJ1Z0xpc3RlbmVyKiBsaXN0ZW5lciwgYm9v bAogCiB2b2lkIFdvcmtlclNjcmlwdERlYnVnU2VydmVyOjpyZWNvbXBpbGVBbGxKU0Z1bmN0aW9u cygpCiB7Ci0gICAgSlNDOjpWTSogdm0gPSBtX3dvcmtlckdsb2JhbFNjb3BlLT5zY3JpcHQoKS0+ dm0oKTsKKyAgICBKU0M6OlZNJiB2bSA9IG1fd29ya2VyR2xvYmFsU2NvcGUtPnNjcmlwdCgpLT52 bSgpOwogCiAgICAgSlNDOjpKU0xvY2tIb2xkZXIgbG9jayh2bSk7Ci0gICAgSlNDOjpEZWJ1Z2dl cjo6cmVjb21waWxlQWxsSlNGdW5jdGlvbnModm0pOworICAgIEpTQzo6RGVidWdnZXI6OnJlY29t cGlsZUFsbEpTRnVuY3Rpb25zKCZ2bSk7CiB9CiAKIHZvaWQgV29ya2VyU2NyaXB0RGVidWdTZXJ2 ZXI6OnJ1bkV2ZW50TG9vcFdoaWxlUGF1c2VkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVu dFJ1bGVDb2xsZWN0b3IuY3BwCmluZGV4IDI2ZTM4MjEuLmEyNWExY2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcApAQCAtMjg4LDEwICsyODgsMTAgQEAg aW5saW5lIGJvb2wgRWxlbWVudFJ1bGVDb2xsZWN0b3I6OnJ1bGVNYXRjaGVzKGNvbnN0IFJ1bGVE YXRhJiBydWxlRGF0YSwgUHNldWRvSWQKICNpZiBFTkFCTEUoQ1NTX1NFTEVDVE9SX0pJVCkKICAg ICB2b2lkKiBjb21waWxlZFNlbGVjdG9yQ2hlY2tlciA9IHJ1bGVEYXRhLmNvbXBpbGVkU2VsZWN0 b3JDb2RlUmVmKCkuY29kZSgpLmV4ZWN1dGFibGVBZGRyZXNzKCk7CiAgICAgaWYgKCFjb21waWxl ZFNlbGVjdG9yQ2hlY2tlciAmJiBydWxlRGF0YS5jb21waWxhdGlvblN0YXR1cygpID09IFNlbGVj dG9yQ29tcGlsYXRpb25TdGF0dXM6Ok5vdENvbXBpbGVkKSB7Ci0gICAgICAgIEpTQzo6Vk0qIHZt ID0gbV9lbGVtZW50LmRvY3VtZW50KCkuc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpOwor ICAgICAgICBKU0M6OlZNJiB2bSA9IG1fZWxlbWVudC5kb2N1bWVudCgpLnNjcmlwdEV4ZWN1dGlv bkNvbnRleHQoKS0+dm0oKTsKICAgICAgICAgU2VsZWN0b3JDb21waWxhdGlvblN0YXR1cyBjb21w aWxhdGlvblN0YXR1czsKICAgICAgICAgSlNDOjpNYWNyb0Fzc2VtYmxlckNvZGVSZWYgY29tcGls ZWRTZWxlY3RvckNvZGVSZWY7Ci0gICAgICAgIGNvbXBpbGF0aW9uU3RhdHVzID0gU2VsZWN0b3JD b21waWxlcjo6Y29tcGlsZVNlbGVjdG9yKHJ1bGVEYXRhLnNlbGVjdG9yKCksIHZtLCBTZWxlY3Rv ckNvbXBpbGVyOjpTZWxlY3RvckNvbnRleHQ6OlJ1bGVDb2xsZWN0b3IsIGNvbXBpbGVkU2VsZWN0 b3JDb2RlUmVmKTsKKyAgICAgICAgY29tcGlsYXRpb25TdGF0dXMgPSBTZWxlY3RvckNvbXBpbGVy Ojpjb21waWxlU2VsZWN0b3IocnVsZURhdGEuc2VsZWN0b3IoKSwgJnZtLCBTZWxlY3RvckNvbXBp bGVyOjpTZWxlY3RvckNvbnRleHQ6OlJ1bGVDb2xsZWN0b3IsIGNvbXBpbGVkU2VsZWN0b3JDb2Rl UmVmKTsKIAogICAgICAgICBydWxlRGF0YS5zZXRDb21waWxlZFNlbGVjdG9yKGNvbXBpbGF0aW9u U3RhdHVzLCBjb21waWxlZFNlbGVjdG9yQ29kZVJlZik7CiAgICAgICAgIGNvbXBpbGVkU2VsZWN0 b3JDaGVja2VyID0gcnVsZURhdGEuY29tcGlsZWRTZWxlY3RvckNvZGVSZWYoKS5jb2RlKCkuZXhl Y3V0YWJsZUFkZHJlc3MoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRF eGVjdXRpb25Db250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25D b250ZXh0LmNwcAppbmRleCBmOGIwYmQ5Li4yNTk5OWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuY3BwCkBAIC00MDMsMTYgKzQwMywxMiBAQCBTY3Jp cHRFeGVjdXRpb25Db250ZXh0OjpUYXNrOjp+VGFzaygpCiB7CiB9CiAKLUpTQzo6Vk0qIFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQ6OnZtKCkKK0pTQzo6Vk0mIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6 OnZtKCkKIHsKICAgICAgaWYgKGlzRG9jdW1lbnQoKSkKLSAgICAgICAgcmV0dXJuICZKU0RPTVdp bmRvdzo6Y29tbW9uVk0oKTsKKyAgICAgICAgcmV0dXJuIEpTRE9NV2luZG93Ojpjb21tb25WTSgp OwogCi0gICAgaWYgKGlzV29ya2VyR2xvYmFsU2NvcGUoKSkKLSAgICAgICAgcmV0dXJuIHRvV29y a2VyR2xvYmFsU2NvcGUodGhpcyktPnNjcmlwdCgpLT52bSgpOwotCi0gICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHRvV29ya2VyR2xvYmFsU2NvcGUo KnRoaXMpLnNjcmlwdCgpLT52bSgpOwogfQogCiAjaWYgRU5BQkxFKFNRTF9EQVRBQkFTRSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmggYi9T b3VyY2UvV2ViQ29yZS9kb20vU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oCmluZGV4IDI5ODFjNTAu LjkyZTE0YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25D b250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQu aApAQCAtMTQzLDcgKzE0Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZVRpbWVvdXQoaW50 IHRpbWVvdXRJZCkgeyBtX3RpbWVvdXRzLnJlbW92ZSh0aW1lb3V0SWQpOyB9CiAgICAgRE9NVGlt ZXIqIGZpbmRUaW1lb3V0KGludCB0aW1lb3V0SWQpIHsgcmV0dXJuIG1fdGltZW91dHMuZ2V0KHRp bWVvdXRJZCk7IH0KIAotICAgIEpTQzo6Vk0qIHZtKCk7CisgICAgSlNDOjpWTSYgdm0oKTsKIAog ICAgIC8vIEludGVydmFsIGlzIGluIHNlY29uZHMuCiAgICAgdm9pZCBhZGp1c3RNaW5pbXVtVGlt ZXJJbnRlcnZhbChkb3VibGUgb2xkTWluaW11bVRpbWVySW50ZXJ2YWwpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L1NlbGVjdG9yUXVlcnkuY3BwCmluZGV4IDliYzBhODMuLjJmOTc4YjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vU2VsZWN0b3JRdWVyeS5jcHAKQEAgLTM5OSw4ICszOTksOCBAQCBBTFdBWVNfSU5MSU5FIHZv aWQgU2VsZWN0b3JEYXRhTGlzdDo6ZXhlY3V0ZShDb250YWluZXJOb2RlJiByb290Tm9kZSwgdHlw ZW5hbWUgUwogICAgICAgICBjb25zdCBTZWxlY3RvckRhdGEmIHNlbGVjdG9yRGF0YSA9IG1fc2Vs ZWN0b3JzLmZpcnN0KCk7CiAgICAgICAgIEFTU0VSVChtX21hdGNoVHlwZSA9PSBSaWdodE1vc3RX aXRoSWRNYXRjaCB8fCBzZWxlY3RvckRhdGEuY29tcGlsYXRpb25TdGF0dXMgPT0gU2VsZWN0b3JD b21waWxhdGlvblN0YXR1czo6Tm90Q29tcGlsZWQpOwogCi0gICAgICAgIEpTQzo6Vk0qIHZtID0g c2VhcmNoUm9vdE5vZGUtPmRvY3VtZW50KCkuc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgp OwotICAgICAgICBzZWxlY3RvckRhdGEuY29tcGlsYXRpb25TdGF0dXMgPSBTZWxlY3RvckNvbXBp bGVyOjpjb21waWxlU2VsZWN0b3Ioc2VsZWN0b3JEYXRhLnNlbGVjdG9yLCB2bSwgU2VsZWN0b3JD b21waWxlcjo6U2VsZWN0b3JDb250ZXh0OjpRdWVyeVNlbGVjdG9yLCBzZWxlY3RvckRhdGEuY29t cGlsZWRTZWxlY3RvckNvZGVSZWYpOworICAgICAgICBKU0M6OlZNJiB2bSA9IHNlYXJjaFJvb3RO b2RlLT5kb2N1bWVudCgpLnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKTsKKyAgICAgICAg c2VsZWN0b3JEYXRhLmNvbXBpbGF0aW9uU3RhdHVzID0gU2VsZWN0b3JDb21waWxlcjo6Y29tcGls ZVNlbGVjdG9yKHNlbGVjdG9yRGF0YS5zZWxlY3RvciwgJnZtLCBTZWxlY3RvckNvbXBpbGVyOjpT ZWxlY3RvckNvbnRleHQ6OlF1ZXJ5U2VsZWN0b3IsIHNlbGVjdG9yRGF0YS5jb21waWxlZFNlbGVj dG9yQ29kZVJlZik7CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHNlbGVjdG9yRGF0YS5jb21waWxh dGlvblN0YXR1cyAhPSBTZWxlY3RvckNvbXBpbGF0aW9uU3RhdHVzOjpTZWxlY3RvckNoZWNrZXJX aXRoQ2hlY2tpbmdDb250ZXh0KTsKIAogICAgICAgICBpZiAoc2VsZWN0b3JEYXRhLmNvbXBpbGF0 aW9uU3RhdHVzID09IFNlbGVjdG9yQ29tcGlsYXRpb25TdGF0dXM6OlNpbXBsZVNlbGVjdG9yQ2hl Y2tlcikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAppbmRleCA5 YWIxYjBkLi5mZTkxZmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52 YXNFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50 LmNwcApAQCAtNTk4LDcgKzU5OCw3IEBAIHZvaWQgSFRNTENhbnZhc0VsZW1lbnQ6OmNyZWF0ZUlt YWdlQnVmZmVyKCkgY29uc3QKIAogICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2soc2NyaXB0RXhl Y3V0aW9uQ29udGV4dCgpLT52bSgpKTsKICAgICBzaXplX3QgbnVtQnl0ZXMgPSA0ICogbV9pbWFn ZUJ1ZmZlci0+aW50ZXJuYWxTaXplKCkud2lkdGgoKSAqIG1faW1hZ2VCdWZmZXItPmludGVybmFs U2l6ZSgpLmhlaWdodCgpOwotICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKS0+aGVh cC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QobnVtQnl0ZXMpOworICAgIHNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKS0+dm0oKS5oZWFwLnJlcG9ydEV4dHJhTWVtb3J5Q29zdChudW1CeXRlcyk7CiAKICNp ZiBVU0UoSU9TVVJGQUNFX0NBTlZBU19CQUNLSU5HX1NUT1JFKSB8fCBFTkFCTEUoQUNDRUxFUkFU RURfMkRfQ0FOVkFTKQogICAgIGlmIChtX2NvbnRleHQgJiYgbV9jb250ZXh0LT5pczJkKCkpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggNDExYWJhMy4uMWUyYmRhZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtMTE5OCw4ICsxMTk4LDggQEAgcHJp dmF0ZToKIAogU3RyaW5nIEludGVybmFsczo6cGFyc2VyTWV0YURhdGEoRGVwcmVjYXRlZDo6U2Ny aXB0VmFsdWUgdmFsdWUpCiB7Ci0gICAgSlNDOjpWTSogdm0gPSBjb250ZXh0RG9jdW1lbnQoKS0+ dm0oKTsKLSAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IHZtLT50b3BDYWxsRnJhbWU7CisgICAg SlNDOjpWTSYgdm0gPSBjb250ZXh0RG9jdW1lbnQoKS0+dm0oKTsKKyAgICBKU0M6OkV4ZWNTdGF0 ZSogZXhlYyA9IHZtLnRvcENhbGxGcmFtZTsKICAgICBKU0M6OkpTVmFsdWUgY29kZSA9IHZhbHVl LmpzVmFsdWUoKTsKICAgICBTY3JpcHRFeGVjdXRhYmxlKiBleGVjdXRhYmxlOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNv cmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRleCAzNTFmMTg1Li5lM2RlNDZkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTkzMiw5ICs5MzIsOSBAQCB2b2lkIFhN TEh0dHBSZXF1ZXN0Ojpkcm9wUHJvdGVjdGlvbigpCiAgICAgLy8gb3V0LiBCdXQgaXQgaXMgcHJv dGVjdGVkIGZyb20gR0Mgd2hpbGUgbG9hZGluZywgc28gdGhpcwogICAgIC8vIGNhbid0IGJlIHJl Y291cGVkIHVudGlsIHRoZSBsb2FkIGlzIGRvbmUsIHNvIG9ubHkKICAgICAvLyByZXBvcnQgdGhl IGV4dHJhIGNvc3QgYXQgdGhhdCBwb2ludC4KLSAgICBKU0M6OlZNKiB2bSA9IHNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKS0+dm0oKTsKKyAgICBKU0M6OlZNJiB2bSA9IHNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKS0+dm0oKTsKICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKHZtKTsKLSAgICB2bS0+ aGVhcC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QobV9yZXNwb25zZUJ1aWxkZXIubGVuZ3RoKCkgKiAy KTsKKyAgICB2bS5oZWFwLnJlcG9ydEV4dHJhTWVtb3J5Q29zdChtX3Jlc3BvbnNlQnVpbGRlci5s ZW5ndGgoKSAqIDIpOwogCiAgICAgdW5zZXRQZW5kaW5nQWN0aXZpdHkodGhpcyk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdEV4cG9ydEdlbmVyYXRv ci9XZWJLaXRFeHBvcnRzLmRlZi5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2Vi S2l0RXhwb3J0R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluCmluZGV4IDc2MGI5MGIuLjNl MWVjNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0RXhw b3J0R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi S2l0LnZjeHByb2ovV2ViS2l0RXhwb3J0R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluCkBA IC00NzEsNyArNDcxLDcgQEAgRVhQT1JUUwogICAgICAgICBzeW1ib2xXaXRoUG9pbnRlcig/c3Rv cmVVcGRhdGVkUXVvdGFGb3JPcmlnaW5AQXBwbGljYXRpb25DYWNoZVN0b3JhZ2VAV2ViQ29yZUBA UUFFX05QQlZTZWN1cml0eU9yaWdpbkAyQF9KQFosID9zdG9yZVVwZGF0ZWRRdW90YUZvck9yaWdp bkBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZUBXZWJDb3JlQEBRRUFBX05QRUJWU2VjdXJpdHlPcmln aW5AMkBfSkBaKQogICAgICAgICBzeW1ib2xXaXRoUG9pbnRlcig/Y2FjaGVTdG9yYWdlQFdlYkNv cmVAQFlBQUFWQXBwbGljYXRpb25DYWNoZVN0b3JhZ2VAMUBYWiwgP2NhY2hlU3RvcmFnZUBXZWJD b3JlQEBZQUFFQVZBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZUAxQFhaKQogICAgICAgICBzeW1ib2xX aXRoUG9pbnRlcig/c2V0RGVmYXVsdE9yaWdpblF1b3RhQEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdl QFdlYkNvcmVAQFFBRVhfSkBaLCA/c2V0RGVmYXVsdE9yaWdpblF1b3RhQEFwcGxpY2F0aW9uQ2Fj aGVTdG9yYWdlQFdlYkNvcmVAQFFFQUFYX0pAWikKLSAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIo P3ZtQFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRAV2ViQ29yZUBAUUFFUEFWVk1ASlNDQEBYWiwgP3Zt QFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRAV2ViQ29yZUBAUUVBQVBFQVZWTUBKU0NAQFhaKQorICAg ICAgICBzeW1ib2xXaXRoUG9pbnRlcig/dm1AU2NyaXB0RXhlY3V0aW9uQ29udGV4dEBXZWJDb3Jl QEBRQUVBQVZWTUBKU0NAQFhaLCA/dm1AU2NyaXB0RXhlY3V0aW9uQ29udGV4dEBXZWJDb3JlQEBR RUFBQUVBVlZNQEpTQ0BAWFopCiAgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD9jb21wbGV0ZVVS TEBEb2N1bWVudEBXZWJDb3JlQEBVQkU/QVZVUkxAMkBBQlZTdHJpbmdAV1RGQEBAWiwgP2NvbXBs ZXRlVVJMQERvY3VtZW50QFdlYkNvcmVAQFVFQkE/QVZVUkxAMkBBRUJWU3RyaW5nQFdURkBAQFop CiAgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD8/MURPTVdpbmRvd0BXZWJDb3JlQEBVQUVAWFos ID8/MURPTVdpbmRvd0BXZWJDb3JlQEBVRUFBQFhaKQogICAgICAgICBzeW1ib2xXaXRoUG9pbnRl cig/dmlzaWJsZUNvbnRlbnRSZWN0QFNjcm9sbGFibGVBcmVhQFdlYkNvcmVAQFFCRT9BVkludFJl Y3RAMkBXNFZpc2libGVDb250ZW50UmVjdEJlaGF2aW9yQDEyQEBaLCA/dmlzaWJsZUNvbnRlbnRS ZWN0QFNjcm9sbGFibGVBcmVhQFdlYkNvcmVAQFFFQkE/QVZJbnRSZWN0QDJAVzRWaXNpYmxlQ29u dGVudFJlY3RCZWhhdmlvckAxMkBAWikK