101573 2012-11-08 03:01:15 -0800 [V8] Add context checks to WorldContextHandle and V8DOMWindowShell 2012-11-22 05:52:54 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 101725 102935 102941 103029 0 dcarney webkit-unassigned abarth alecflett dglazkov haraken japhet jsbell vsevik webkit.review.bot yurys oldest_to_newest 761538 0 dcarney 2012-11-08 03:01:15 -0800 [V8] Add context checks to WorldContextHandle and V8DOMWindowShell 761544 1 172976 dcarney 2012-11-08 03:05:06 -0800 Created attachment 172976 Patch 761910 2 172976 abarth 2012-11-08 10:20:16 -0800 Comment on attachment 172976 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172976&action=review Thanks. > Source/WebCore/bindings/v8/V8DOMWindowShell.cpp:471 > + V8DOMWrapper::setJSWrapperForDOMObject(PassRefPtr<DOMWindow>(window), windowWrapper); The explicit call to PassRefPtr<DOMWindow> shouldn't be necessary here. 761992 3 dcarney 2012-11-08 11:16:12 -0800 (In reply to comment #2) > The explicit call to PassRefPtr<DOMWindow> shouldn't be necessary here. I just copied it. I'll move it. It looks like there were some new IDB bugs recently introduced, so this patch is failing 4 idb tests. Should I disable the tests in chrome and file a bug for someone to fix that or wait for fix before committing this? 762327 4 172976 webkit.review.bot 2012-11-08 16:51:37 -0800 Comment on attachment 172976 Patch Attachment 172976 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14781006 New failing tests: http/tests/inspector/indexeddb/database-data.html http/tests/inspector/indexeddb/database-structure.html http/tests/inspector/indexeddb/database-names.html http/tests/inspector/indexeddb/resources-panel.html 762667 5 abarth 2012-11-09 00:41:48 -0800 > It looks like there were some new IDB bugs recently introduced, so this patch is failing 4 idb tests. Should I disable the tests in chrome and file a bug for someone to fix that or wait for fix before committing this? We should see what jsbell and alecflett would like you to do. It looks like there are also some LayoutTests that fail with your patch. 762708 6 dcarney 2012-11-09 01:41:24 -0800 (In reply to comment #5) > > It looks like there were some new IDB bugs recently introduced, so this patch is failing 4 idb tests. Should I disable the tests in chrome and file a bug for someone to fix that or wait for fix before committing this? > > We should see what jsbell and alecflett would like you to do. > > It looks like there are also some LayoutTests that fail with your patch. I added blocking bug 101725 which describes the problem and offers an ugly potential solution. 763114 7 jsbell 2012-11-09 09:59:25 -0800 (Apologies, I'm a gardening today so a bit distracted.) (In reply to comment #3) > > It looks like there were some new IDB bugs recently introduced, so this patch is failing 4 idb tests. Should I disable the tests in chrome and file a bug for someone to fix that or wait for fix before committing this? The 4 inspector/indexeddb tests that are listed above? I've cc'd vsevik on this bug. The inspector's IDB code was just rewritten to talk to the front-end APIs rather than the back-end APIs which may have introduced the problem, given that it will be calling into IDB APIs without necessarily having V8 on the stack. 772726 8 175399 dcarney 2012-11-21 03:03:58 -0800 Created attachment 175399 Patch 772729 9 dcarney 2012-11-21 03:06:20 -0800 (In reply to comment #8) > Created an attachment (id=175399) [details] > Patch rebased with latest changes. added CRASH instead of ASSERT when no context is entered and UseCurrentWorld is called 772733 10 172976 abarth 2012-11-21 03:11:27 -0800 Comment on attachment 172976 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172976&action=review >> Source/WebCore/bindings/v8/V8DOMWindowShell.cpp:471 >> + V8DOMWrapper::setJSWrapperForDOMObject(PassRefPtr<DOMWindow>(window), windowWrapper); > > The explicit call to PassRefPtr<DOMWindow> shouldn't be necessary here. Looks like this comment still applies to the final patch. 772736 11 dcarney 2012-11-21 03:14:49 -0800 (In reply to comment #10) > (From update of attachment 172976 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=172976&action=review > > >> Source/WebCore/bindings/v8/V8DOMWindowShell.cpp:471 > >> + V8DOMWrapper::setJSWrapperForDOMObject(PassRefPtr<DOMWindow>(window), windowWrapper); > > > > The explicit call to PassRefPtr<DOMWindow> shouldn't be necessary here. > > Looks like this comment still applies to the final patch. Yeah, I had to rebase that patch by hand and didn't see it. 772757 12 175399 webkit.review.bot 2012-11-21 03:26:24 -0800 Comment on attachment 175399 Patch Rejecting attachment 175399 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ngs/v8/V8DOMWindowShell.cpp Hunk #1 FAILED at 80. Hunk #2 succeeded at 328 (offset -98 lines). Hunk #3 succeeded at 345 (offset -98 lines). 1 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/bindings/v8/V8DOMWindowShell.cpp.rej patching file Source/WebCore/bindings/v8/V8DOMWindowShell.h patching file Source/WebCore/bindings/v8/WorldContextHandle.cpp Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/14943008 772768 13 dcarney 2012-11-21 03:42:22 -0800 (In reply to comment #10) > (From update of attachment 172976 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=172976&action=review > > >> Source/WebCore/bindings/v8/V8DOMWindowShell.cpp:471 > >> + V8DOMWrapper::setJSWrapperForDOMObject(PassRefPtr<DOMWindow>(window), windowWrapper); > > > > The explicit call to PassRefPtr<DOMWindow> shouldn't be necessary here. > > Looks like this comment still applies to the final patch. taking it away gives a compile error 772771 14 abarth 2012-11-21 03:45:10 -0800 ok 772774 15 175407 dcarney 2012-11-21 03:50:54 -0800 Created attachment 175407 Patch 772775 16 175407 dcarney 2012-11-21 03:51:43 -0800 Comment on attachment 175407 Patch re-rebased 772776 17 175407 webkit.review.bot 2012-11-21 03:54:30 -0800 Comment on attachment 175407 Patch Rejecting attachment 175407 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/14916978 772777 18 175407 haraken 2012-11-21 03:55:10 -0800 Comment on attachment 175407 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175407&action=review > Source/WebCore/ChangeLog:6 > + Reviewed by NOBODY (OOPS!). You need to write Adam Barth here. 772779 19 175408 dcarney 2012-11-21 03:57:49 -0800 Created attachment 175408 Patch 772790 20 175408 webkit.review.bot 2012-11-21 04:25:05 -0800 Comment on attachment 175408 Patch Clearing flags on attachment: 175408 Committed r135383: <http://trac.webkit.org/changeset/135383> 772791 21 webkit.review.bot 2012-11-21 04:25:10 -0800 All reviewed patches have been landed. Closing bug. 772895 22 webkit.review.bot 2012-11-21 06:38:12 -0800 Re-opened since this is blocked by bug 102935 772991 23 175408 dcarney 2012-11-21 08:13:12 -0800 Comment on attachment 175408 Patch reason for rollback fixed 773290 24 175408 webkit.review.bot 2012-11-21 14:24:49 -0800 Comment on attachment 175408 Patch Clearing flags on attachment: 175408 Committed r135433: <http://trac.webkit.org/changeset/135433> 773291 25 webkit.review.bot 2012-11-21 14:24:54 -0800 All reviewed patches have been landed. Closing bug. 773637 26 webkit.review.bot 2012-11-21 23:44:34 -0800 Re-opened since this is blocked by bug 103029 773644 27 yurys 2012-11-21 23:49:09 -0800 (In reply to comment #23) > (From update of attachment 175408 [details]) > reason for rollback fixed I don't think it is fixed. The test still fails both on bots an on my local build. 773867 28 175408 dcarney 2012-11-22 05:38:48 -0800 Comment on attachment 175408 Patch fixed mac build 773880 29 175408 webkit.review.bot 2012-11-22 05:52:48 -0800 Comment on attachment 175408 Patch Clearing flags on attachment: 175408 Committed r135513: <http://trac.webkit.org/changeset/135513> 773881 30 webkit.review.bot 2012-11-22 05:52:54 -0800 All reviewed patches have been landed. Closing bug. 172976 2012-11-08 03:05:06 -0800 2012-11-21 03:11:27 -0800 Patch bug-101573-20121108120315.patch text/plain 5823 dcarney U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzYxN2NmOWM5ZDdiMWUz Y2EyNTNkZTExMGZlM2JjMjBjNGUwNjczZi4uNjg2ZWZkOTlhYmU2MTBmMWY1MTM4MzgyODZjYzc3 NTI4OWQwZmUzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTExLTA4ICBEYW4g Q2FybmV5ICA8ZGNhcm5leUBnb29nbGUuY29tPgorCisgICAgICAgIFtWOF0gQWRkIGNvbnRleHQg Y2hlY2tzIHRvIFdvcmxkQ29udGV4dEhhbmRsZSBhbmQgVjhET01XaW5kb3dTaGVsbAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNTczCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYSBidW5jaCBv ZiBhc3NlcnRpb25zIHRvIGVuc3VyZSB0aGUgcHJvYmxlbXMgd2l0aCBJbmRleGVkREIKKyAgICAg ICAgY29udGV4dHMgY2Fubm90IHJlZW1lcmdlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8g Y2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdp bmRvd1NoZWxsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9NV2luZG93U2hlbGw6OmVudGVy ZWRJc29sYXRlZFdvcmxkQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpWOERPTVdpbmRvd1No ZWxsOjppbnN0YWxsRE9NV2luZG93KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdyYXBw ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhET01XcmFwcGVyOjppc1dyYXBwZXJPZlR5cGUp OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1dvcmxkQ29udGV4dEhhbmRsZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpXb3JsZENvbnRleHRIYW5kbGU6OldvcmxkQ29udGV4dEhhbmRsZSk6CisKIDIw MTItMTEtMDcgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogY29uc29sZSBlcnJvciBhZnRlciBpbnNwZWN0aW5nIEluZGV4ZWRE QgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVs bC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcApp bmRleCAwMmIzNDdkYzI3YjdlNmFiOTAzMzJiYTJjZDdkYWU5NjYzNjQ1OWZlLi43ODRmZmZiN2Vl MDgyMDdlODNkODQ0OGJhYmQ0MzU3NjAyZmFmNDkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcApAQCAtMTc2LDYgKzE3Niw4IEBAIHN0YXRp YyB2b2lkIHNldElzb2xhdGVkV29ybGRGaWVsZChWOERPTVdpbmRvd1NoZWxsKiBzaGVsbCwgdjg6 OkxvY2FsPHY4OjpDb250ZXh0CiAKIFY4RE9NV2luZG93U2hlbGwqIFY4RE9NV2luZG93U2hlbGw6 OmVudGVyZWRJc29sYXRlZFdvcmxkQ29udGV4dCgpCiB7CisgICAgQVNTRVJUKGlzTWFpblRocmVh ZCgpKTsKKyAgICBBU1NFUlQoVjhET01XcmFwcGVyOjppc1dyYXBwZXJPZlR5cGUodG9Jbm5lckds b2JhbE9iamVjdCh2ODo6Q29udGV4dDo6R2V0RW50ZXJlZCgpKSwgJlY4RE9NV2luZG93OjppbmZv KSk7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFY4RE9NV2luZG93U2hlbGwqPih0b0lubmVyR2xv YmFsT2JqZWN0KHY4OjpDb250ZXh0OjpHZXRFbnRlcmVkKCkpLT5HZXRQb2ludGVyRnJvbUludGVy bmFsRmllbGQoVjhET01XaW5kb3c6OmVudGVyZWRJc29sYXRlZFdvcmxkSW5kZXgpKTsKIH0KIApA QCAtNDUwLDcgKzQ1Miw2IEBAIGJvb2wgVjhET01XaW5kb3dTaGVsbDo6aW5zdGFsbERPTVdpbmRv dygpCiAKICAgICBWOERPTVdyYXBwZXI6OnNldERPTVdyYXBwZXIod2luZG93V3JhcHBlciwgJlY4 RE9NV2luZG93OjppbmZvLCB3aW5kb3cpOwogICAgIFY4RE9NV3JhcHBlcjo6c2V0RE9NV3JhcHBl cih2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KHdpbmRvd1dyYXBwZXItPkdldFByb3RvdHlw ZSgpKSwgJlY4RE9NV2luZG93OjppbmZvLCB3aW5kb3cpOwotICAgIFY4RE9NV3JhcHBlcjo6c2V0 SlNXcmFwcGVyRm9yRE9NT2JqZWN0KFBhc3NSZWZQdHI8RE9NV2luZG93Pih3aW5kb3cpLCB3aW5k b3dXcmFwcGVyKTsKIAogICAgIC8vIEluc3RhbGwgdGhlIHdpbmRvd1dyYXBwZXIgYXMgdGhlIHBy b3RvdHlwZSBvZiB0aGUgaW5uZXJHbG9iYWxPYmplY3QuCiAgICAgLy8gVGhlIGZ1bGwgc3RydWN0 dXJlIG9mIHRoZSBnbG9iYWwgb2JqZWN0IGlzIGFzIGZvbGxvd3M6CkBAIC00NjcsNiArNDY4LDcg QEAgYm9vbCBWOERPTVdpbmRvd1NoZWxsOjppbnN0YWxsRE9NV2luZG93KCkKICAgICAvLwogICAg IHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gaW5uZXJHbG9iYWxPYmplY3QgPSB0b0lubmVyR2xvYmFs T2JqZWN0KG1fY29udGV4dC5nZXQoKSk7CiAgICAgVjhET01XcmFwcGVyOjpzZXRET01XcmFwcGVy KGlubmVyR2xvYmFsT2JqZWN0LCAmVjhET01XaW5kb3c6OmluZm8sIHdpbmRvdyk7CisgICAgVjhE T01XcmFwcGVyOjpzZXRKU1dyYXBwZXJGb3JET01PYmplY3QoUGFzc1JlZlB0cjxET01XaW5kb3c+ KHdpbmRvdyksIHdpbmRvd1dyYXBwZXIpOwogICAgIGlubmVyR2xvYmFsT2JqZWN0LT5TZXRQcm90 b3R5cGUod2luZG93V3JhcHBlcik7CiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBwZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcAppbmRleCBhYWM5NWRiZWUyYTNjMjA1YmUx YzAzMTUyNDA5MmQ5YzFmMzViYjQ2Li4xZjA4ZTczNWMzZGI5NmM4YTM0ZjAxNTFmMmUyNjJhMzQw NzRmM2E4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBw ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5jcHAK QEAgLTE1NCw4ICsxNTQsMTAgQEAgYm9vbCBWOERPTVdyYXBwZXI6OmlzV3JhcHBlck9mVHlwZSh2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUsIFdyYXBwZXJUeXBlSW5mbyoKICAgICB2ODo6SGFu ZGxlPHY4OjpPYmplY3Q+IG9iamVjdCA9IHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QodmFs dWUpOwogICAgIEFTU0VSVChvYmplY3QtPkludGVybmFsRmllbGRDb3VudCgpID49IHY4RGVmYXVs dFdyYXBwZXJJbnRlcm5hbEZpZWxkQ291bnQpOwogCisjaWZuZGVmIE5ERUJVRwogICAgIHY4OjpI YW5kbGU8djg6OlZhbHVlPiB3cmFwcGVyID0gb2JqZWN0LT5HZXRJbnRlcm5hbEZpZWxkKHY4RE9N V3JhcHBlck9iamVjdEluZGV4KTsKLSAgICBBU1NFUlRfVU5VU0VEKHdyYXBwZXIsIHdyYXBwZXIt PklzTnVtYmVyKCkgfHwgd3JhcHBlci0+SXNFeHRlcm5hbCgpKTsKKyAgICBBU1NFUlQod3JhcHBl ci0+SXNOdW1iZXIoKSB8fCB3cmFwcGVyLT5Jc0V4dGVybmFsKCkpOworI2VuZGlmCiAKICAgICBX cmFwcGVyVHlwZUluZm8qIHR5cGVJbmZvID0gc3RhdGljX2Nhc3Q8V3JhcHBlclR5cGVJbmZvKj4o b2JqZWN0LT5HZXRQb2ludGVyRnJvbUludGVybmFsRmllbGQodjhET01XcmFwcGVyVHlwZUluZGV4 KSk7CiAgICAgcmV0dXJuIHR5cGVJbmZvID09IHR5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9Xb3JsZENvbnRleHRIYW5kbGUuY3BwIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvV29ybGRDb250ZXh0SGFuZGxlLmNwcAppbmRleCAzNGI5YzE5YmY1OTgwODUx ZjJmMjZiMmZiYTNjYjRlNzM4MjY1OWY5Li4wYmEwMWM5NDMyN2RiZWZlZjVkZDc2YzhiNDk5ZDk1 OWU0NjY4Yjg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JsZENv bnRleHRIYW5kbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmxkQ29u dGV4dEhhbmRsZS5jcHAKQEAgLTM1LDI1ICszNSwzMyBAQAogI2luY2x1ZGUgIlY4QmluZGluZy5o IgogI2luY2x1ZGUgIlY4RE9NV2luZG93LmgiCiAjaW5jbHVkZSAiVjhET01XaW5kb3dTaGVsbC5o IgorI2luY2x1ZGUgIlY4RGVkaWNhdGVkV29ya2VyQ29udGV4dC5oIgorI2luY2x1ZGUgIlY4U2hh cmVkV29ya2VyQ29udGV4dC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFdvcmxkQ29udGV4 dEhhbmRsZTo6V29ybGRDb250ZXh0SGFuZGxlKFdvcmxkVG9Vc2Ugd29ybGRUb1VzZSkKICAgICA6 IG1fd29ybGRUb1VzZSh3b3JsZFRvVXNlKQogewotICAgIGlmICh3b3JsZFRvVXNlID09IFVzZU1h aW5Xb3JsZCB8fCB3b3JsZFRvVXNlID09IFVzZVdvcmtlcldvcmxkKQorICAgIEFTU0VSVCh3b3Js ZFRvVXNlICE9IFVzZVdvcmtlcldvcmxkKTsKKworICAgIGlmICh3b3JsZFRvVXNlICE9IFVzZUN1 cnJlbnRXb3JsZCkKICAgICAgICAgcmV0dXJuOwogCisgICAgQVNTRVJUKHY4OjpDb250ZXh0OjpJ bkNvbnRleHQoKSk7CisgICAgQVNTRVJUKCF2ODo6Q29udGV4dDo6R2V0Q3VycmVudCgpLklzRW1w dHkoKSk7CisKICNpZiBFTkFCTEUoV09SS0VSUykKICAgICAvLyBGSVhNRSBXZSBhcmUgZHVwbGlj YXRpbmcgYSBsb3Qgb2YgZWZmb3J0IGhlcmUgY2hlY2tpbmcgdGhlIGNvbnRleHQgZm9yIHRoZSB3 b3JrZXIgYW5kIGZvciB0aGUgaXNvbGF0ZWQgd29ybGQuCi0gICAgaWYgKHY4OjpDb250ZXh0OjpJ bkNvbnRleHQoKSkgewotICAgICAgICB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0ID0g djg6OkNvbnRleHQ6OkdldEN1cnJlbnQoKTsKLSAgICAgICAgaWYgKCFjb250ZXh0LklzRW1wdHko KSkgewotICAgICAgICAgICAgaWYgKFVOTElLRUxZKCFWOERPTVdyYXBwZXI6OmlzV3JhcHBlck9m VHlwZSh0b0lubmVyR2xvYmFsT2JqZWN0KGNvbnRleHQpLCAmVjhET01XaW5kb3c6OmluZm8pKSkg ewotICAgICAgICAgICAgICAgIG1fd29ybGRUb1VzZSA9IFVzZVdvcmtlcldvcmxkOwotICAgICAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQorICAgIHY4OjpIYW5k bGU8djg6OkNvbnRleHQ+IGNvbnRleHQgPSB2ODo6Q29udGV4dDo6R2V0Q3VycmVudCgpOworICAg IGlmIChVTkxJS0VMWSghVjhET01XcmFwcGVyOjppc1dyYXBwZXJPZlR5cGUodG9Jbm5lckdsb2Jh bE9iamVjdChjb250ZXh0KSwgJlY4RE9NV2luZG93OjppbmZvKSkpIHsKKyNpZiBFTkFCTEUoU0hB UkVEX1dPUktFUlMpCisgICAgICAgIEFTU0VSVChWOERPTVdyYXBwZXI6OmlzV3JhcHBlck9mVHlw ZSh0b0lubmVyR2xvYmFsT2JqZWN0KGNvbnRleHQpLT5HZXRQcm90b3R5cGUoKSwgJlY4RGVkaWNh dGVkV29ya2VyQ29udGV4dDo6aW5mbykgfHwgVjhET01XcmFwcGVyOjppc1dyYXBwZXJPZlR5cGUo dG9Jbm5lckdsb2JhbE9iamVjdChjb250ZXh0KS0+R2V0UHJvdG90eXBlKCksICZWOFNoYXJlZFdv cmtlckNvbnRleHQ6OmluZm8pKTsKKyNlbHNlCisgICAgICAgIEFTU0VSVChWOERPTVdyYXBwZXI6 OmlzV3JhcHBlck9mVHlwZSh0b0lubmVyR2xvYmFsT2JqZWN0KGNvbnRleHQpLT5HZXRQcm90b3R5 cGUoKSwgJlY4RGVkaWNhdGVkV29ya2VyQ29udGV4dDo6aW5mbykpOworI2VuZGlmCisgICAgICAg IG1fd29ybGRUb1VzZSA9IFVzZVdvcmtlcldvcmxkOworICAgICAgICByZXR1cm47CiAgICAgfQog I2VuZGlmCiAK 175399 2012-11-21 03:03:58 -0800 2012-11-21 03:50:47 -0800 Patch bug-101573-20121121120145.patch text/plain 5664 dcarney U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWVjMWNjODI4OTBjZWVm NWYzZGIzOTIzMjZkYzFkNGI5YTNiODRjNC4uNGIzYmQzYjg0N2EzY2NiZTU4NWI4YjljN2U3NDRj M2QwYWQxMDliZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDEyLTExLTIxICBEYW4g Q2FybmV5ICA8ZGNhcm5leUBnb29nbGUuY29tPgogCisgICAgICAgIFtWOF0gQWRkIGNvbnRleHQg Y2hlY2tzIHRvIFdvcmxkQ29udGV4dEhhbmRsZSBhbmQgVjhET01XaW5kb3dTaGVsbAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNTczCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYSBidW5jaCBv ZiBhc3NlcnRpb25zIHRvIGVuc3VyZSB0aGUgcHJvYmxlbXMgd2l0aCBJbmRleGVkREIKKyAgICAg ICAgY29udGV4dHMgY2Fubm90IHJlZW1lcmdlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8g Y2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdp bmRvd1NoZWxsLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6VjhE T01XaW5kb3dTaGVsbDo6YXNzZXJ0Q29udGV4dEhhc0NvcnJlY3RQcm90b3R5cGUpOgorICAgICAg ICAqIGJpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuaDoKKyAgICAgICAgKFY4RE9NV2luZG93 U2hlbGwpOgorICAgICAgICAoV2ViQ29yZTo6VjhET01XaW5kb3dTaGVsbDo6aXNvbGF0ZWQpOgor ICAgICAgICAqIGJpbmRpbmdzL3Y4L1dvcmxkQ29udGV4dEhhbmRsZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpXb3JsZENvbnRleHRIYW5kbGU6OldvcmxkQ29udGV4dEhhbmRsZSk6CisKKzIwMTIt MTEtMjEgIERhbiBDYXJuZXkgIDxkY2FybmV5QGdvb2dsZS5jb20+CisKICAgICAgICAgW1Y4XSBJ bnNwZWN0b3IgZG9lcyBub3QgY2FsbGJhY2sgSURCIG1ldGhvZHMgaW4gY29udGV4dAogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNzI1CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHAKaW5kZXggYWRh YzllODRhNGYzNWFmMjE1YWIzOWQ5NjkzNmFkZmY4N2YxM2E1OC4uN2JkZGU1MDlmZTYyZDVkMGQ3 YmM1YjUzMDI1YmU5ZGY3YzhiM2Q1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvVjhET01XaW5kb3dTaGVsbC5jcHAKQEAgLTgwLDYgKzgwLDE0IEBACiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAorI2lmbmRlZiBOREVCVUcKK3ZvaWQgVjhET01XaW5kb3dTaGVsbDo6YXNzZXJ0 Q29udGV4dEhhc0NvcnJlY3RQcm90b3R5cGUoKQoreworICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7CisgICAgQVNTRVJUKFY4RE9NV3JhcHBlcjo6aXNXcmFwcGVyT2ZUeXBlKHRvSW5uZXJHbG9i YWxPYmplY3Qodjg6OkNvbnRleHQ6OkdldEVudGVyZWQoKSksICZWOERPTVdpbmRvdzo6aW5mbykp OworfQorI2VuZGlmCisKIHN0YXRpYyB2b2lkIHJlcG9ydEZhdGFsRXJyb3IoY29uc3QgY2hhciog bG9jYXRpb24sIGNvbnN0IGNoYXIqIG1lc3NhZ2UpCiB7CiAgICAgaW50IG1lbW9yeVVzYWdlTUIg PSBNZW1vcnlVc2FnZVN1cHBvcnQ6OmFjdHVhbE1lbW9yeVVzYWdlTUIoKTsKQEAgLTQyNiw3ICs0 MzQsNiBAQCBib29sIFY4RE9NV2luZG93U2hlbGw6Omluc3RhbGxET01XaW5kb3coKQogICAgIFY4 RE9NV2luZG93OjppbnN0YWxsUGVyQ29udGV4dFByb3BlcnRpZXMod2luZG93V3JhcHBlciwgd2lu ZG93KTsKIAogICAgIFY4RE9NV3JhcHBlcjo6c2V0RE9NV3JhcHBlcih2ODo6SGFuZGxlPHY4OjpP YmplY3Q+OjpDYXN0KHdpbmRvd1dyYXBwZXItPkdldFByb3RvdHlwZSgpKSwgJlY4RE9NV2luZG93 OjppbmZvLCB3aW5kb3cpOwotICAgIFY4RE9NV3JhcHBlcjo6Y3JlYXRlRE9NV3JhcHBlcihQYXNz UmVmUHRyPERPTVdpbmRvdz4od2luZG93KSwgJlY4RE9NV2luZG93OjppbmZvLCB3aW5kb3dXcmFw cGVyKTsKIAogICAgIC8vIEluc3RhbGwgdGhlIHdpbmRvd1dyYXBwZXIgYXMgdGhlIHByb3RvdHlw ZSBvZiB0aGUgaW5uZXJHbG9iYWxPYmplY3QuCiAgICAgLy8gVGhlIGZ1bGwgc3RydWN0dXJlIG9m IHRoZSBnbG9iYWwgb2JqZWN0IGlzIGFzIGZvbGxvd3M6CkBAIC00NDQsNiArNDUxLDcgQEAgYm9v bCBWOERPTVdpbmRvd1NoZWxsOjppbnN0YWxsRE9NV2luZG93KCkKICAgICB2ODo6SGFuZGxlPHY4 OjpPYmplY3Q+IGlubmVyR2xvYmFsT2JqZWN0ID0gdG9Jbm5lckdsb2JhbE9iamVjdChtX2NvbnRl eHQuZ2V0KCkpOwogICAgIFY4RE9NV3JhcHBlcjo6c2V0RE9NV3JhcHBlcihpbm5lckdsb2JhbE9i amVjdCwgJlY4RE9NV2luZG93OjppbmZvLCB3aW5kb3cpOwogICAgIGlubmVyR2xvYmFsT2JqZWN0 LT5TZXRQcm90b3R5cGUod2luZG93V3JhcHBlcik7CisgICAgVjhET01XcmFwcGVyOjpjcmVhdGVE T01XcmFwcGVyKFBhc3NSZWZQdHI8RE9NV2luZG93Pih3aW5kb3cpLCAmVjhET01XaW5kb3c6Omlu Zm8sIHdpbmRvd1dyYXBwZXIpOwogICAgIHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmggYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmgKaW5kZXggZmJlMjUyZDM3ZmY4MGI0 ZjUwOTA3NjI2MjdhNzcxOWY0Y2M2NzdiZi4uNGY4MzE3ZTYxMTE0MDFkNzA1NGIyODU1MTZlMWMx YjkyMjgwMzRjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01X aW5kb3dTaGVsbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93 U2hlbGwuaApAQCAtODAsOCArODAsMTUgQEAgcHVibGljOgogCiAgICAgdm9pZCBkZXN0cm95R2xv YmFsKCk7CiAKKyNpZm5kZWYgTkRFQlVHCisgICAgc3RhdGljIHZvaWQgYXNzZXJ0Q29udGV4dEhh c0NvcnJlY3RQcm90b3R5cGUoKTsKKyNlbmRpZgorCiAgICAgc3RhdGljIFY4RE9NV2luZG93U2hl bGwqIGlzb2xhdGVkKHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQpCiAgICAgeworI2lm bmRlZiBOREVCVUcKKyAgICAgICAgYXNzZXJ0Q29udGV4dEhhc0NvcnJlY3RQcm90b3R5cGUoKTsK KyNlbmRpZgogICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8VjhET01XaW5kb3dTaGVsbCo+KGNv bnRleHQtPkdldEFsaWduZWRQb2ludGVyRnJvbUVtYmVkZGVyRGF0YSh2OENvbnRleHRJc29sYXRl ZFdpbmRvd1NoZWxsKSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9Xb3JsZENvbnRleHRIYW5kbGUuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvV29ybGRDb250ZXh0SGFuZGxlLmNwcAppbmRleCBlMmY2ODdiODU3MWZjYWFiMzcyYmEzYWQy YzEzZTE0NzNkZjA0NmFlLi4zMGE4Y2IwODEyYzA0MTQ2NzQ0MTFiNmFkNmJjOThhNWQ3MTE0NGJl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JsZENvbnRleHRIYW5k bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmxkQ29udGV4dEhhbmRs ZS5jcHAKQEAgLTM1LDI3ICszNSwzOCBAQAogI2luY2x1ZGUgIlY4QmluZGluZy5oIgogI2luY2x1 ZGUgIlY4RE9NV2luZG93LmgiCiAjaW5jbHVkZSAiVjhET01XaW5kb3dTaGVsbC5oIgorI2luY2x1 ZGUgIlY4RGVkaWNhdGVkV29ya2VyQ29udGV4dC5oIgorI2luY2x1ZGUgIlY4U2hhcmVkV29ya2Vy Q29udGV4dC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFdvcmxkQ29udGV4dEhhbmRsZTo6 V29ybGRDb250ZXh0SGFuZGxlKFdvcmxkVG9Vc2Ugd29ybGRUb1VzZSkKICAgICA6IG1fd29ybGRU b1VzZSh3b3JsZFRvVXNlKQogeworICAgIEFTU0VSVCh3b3JsZFRvVXNlICE9IFVzZVdvcmtlcldv cmxkKTsKKwogICAgIGlmICh3b3JsZFRvVXNlID09IFVzZU1haW5Xb3JsZCB8fCB3b3JsZFRvVXNl ID09IFVzZVdvcmtlcldvcmxkKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAodjg6OkNvbnRl eHQ6OkluQ29udGV4dCgpKSB7Ci0gICAgICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNvbnRl eHQgPSB2ODo6Q29udGV4dDo6R2V0Q3VycmVudCgpOworICAgIGlmICghdjg6OkNvbnRleHQ6Oklu Q29udGV4dCgpKQorICAgICAgICBDUkFTSCgpOworCisgICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4 dD4gY29udGV4dCA9IHY4OjpDb250ZXh0OjpHZXRDdXJyZW50KCk7CiAjaWYgRU5BQkxFKFdPUktF UlMpCi0gICAgICAgIGlmIChVTkxJS0VMWSghVjhET01XcmFwcGVyOjppc1dyYXBwZXJPZlR5cGUo dG9Jbm5lckdsb2JhbE9iamVjdChjb250ZXh0KSwgJlY4RE9NV2luZG93OjppbmZvKSkpIHsKLSAg ICAgICAgICAgIG1fd29ybGRUb1VzZSA9IFVzZVdvcmtlcldvcmxkOwotICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICB9CisgICAgaWYgKFVOTElLRUxZKCFWOERPTVdyYXBwZXI6OmlzV3JhcHBl ck9mVHlwZSh0b0lubmVyR2xvYmFsT2JqZWN0KGNvbnRleHQpLCAmVjhET01XaW5kb3c6OmluZm8p KSkgeworI2lmIEVOQUJMRShTSEFSRURfV09SS0VSUykKKyAgICAgICAgQVNTRVJUKFY4RE9NV3Jh cHBlcjo6aXNXcmFwcGVyT2ZUeXBlKHRvSW5uZXJHbG9iYWxPYmplY3QoY29udGV4dCktPkdldFBy b3RvdHlwZSgpLCAmVjhEZWRpY2F0ZWRXb3JrZXJDb250ZXh0OjppbmZvKSB8fCBWOERPTVdyYXBw ZXI6OmlzV3JhcHBlck9mVHlwZSh0b0lubmVyR2xvYmFsT2JqZWN0KGNvbnRleHQpLT5HZXRQcm90 b3R5cGUoKSwgJlY4U2hhcmVkV29ya2VyQ29udGV4dDo6aW5mbykpOworI2Vsc2UKKyAgICAgICAg QVNTRVJUKFY4RE9NV3JhcHBlcjo6aXNXcmFwcGVyT2ZUeXBlKHRvSW5uZXJHbG9iYWxPYmplY3Qo Y29udGV4dCktPkdldFByb3RvdHlwZSgpLCAmVjhEZWRpY2F0ZWRXb3JrZXJDb250ZXh0OjppbmZv KSk7CiAjZW5kaWYKLSAgICAgICAgaWYgKFY4RE9NV2luZG93U2hlbGw6Omlzb2xhdGVkKGNvbnRl eHQpKSB7Ci0gICAgICAgICAgICBtX2NvbnRleHQgPSBTaGFyZWRQZXJzaXN0ZW50PHY4OjpDb250 ZXh0Pjo6Y3JlYXRlKGNvbnRleHQpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Cisg ICAgICAgIG1fd29ybGRUb1VzZSA9IFVzZVdvcmtlcldvcmxkOworICAgICAgICByZXR1cm47Cisg ICAgfQorI2VuZGlmCisKKyAgICBpZiAoVjhET01XaW5kb3dTaGVsbDo6aXNvbGF0ZWQoY29udGV4 dCkpIHsKKyAgICAgICAgbV9jb250ZXh0ID0gU2hhcmVkUGVyc2lzdGVudDx2ODo6Q29udGV4dD46 OmNyZWF0ZShjb250ZXh0KTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIG1fd29ybGRU b1VzZSA9IFVzZU1haW5Xb3JsZDsK 175407 2012-11-21 03:50:54 -0800 2012-11-21 03:57:42 -0800 Patch bug-101573-20121121124841.patch text/plain 5623 dcarney U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1Mzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRmNmMzYzE2M2UyYWZk OTMyNzg5NjY0ZTcyMzZiNGRiOTgzNzgwOS4uMDE5MjA0ODFkNTc5NzM1NDRhY2VjZjlmMjRmOGM1 ODUzZjcxYjY1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTExLTIxICBEYW4g Q2FybmV5ICA8ZGNhcm5leUBnb29nbGUuY29tPgorCisgICAgICAgIFtWOF0gQWRkIGNvbnRleHQg Y2hlY2tzIHRvIFdvcmxkQ29udGV4dEhhbmRsZSBhbmQgVjhET01XaW5kb3dTaGVsbAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNTczCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYSBidW5jaCBv ZiBhc3NlcnRpb25zIHRvIGVuc3VyZSB0aGUgcHJvYmxlbXMgd2l0aCBJbmRleGVkREIKKyAgICAg ICAgY29udGV4dHMgY2Fubm90IHJlZW1lcmdlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8g Y2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdp bmRvd1NoZWxsLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6VjhE T01XaW5kb3dTaGVsbDo6YXNzZXJ0Q29udGV4dEhhc0NvcnJlY3RQcm90b3R5cGUpOgorICAgICAg ICAqIGJpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuaDoKKyAgICAgICAgKFY4RE9NV2luZG93 U2hlbGwpOgorICAgICAgICAoV2ViQ29yZTo6VjhET01XaW5kb3dTaGVsbDo6aXNvbGF0ZWQpOgor ICAgICAgICAqIGJpbmRpbmdzL3Y4L1dvcmxkQ29udGV4dEhhbmRsZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpXb3JsZENvbnRleHRIYW5kbGU6OldvcmxkQ29udGV4dEhhbmRsZSk6CisKIDIwMTIt MTEtMjEgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtW OF0gTW92ZSBWOERPTVdpbmRvd1NoZWxsOjppbml0aWFsaXplVjhJZk5lZWRlZCgpIHRvIFY4SW5p dGlhbGl6ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV2lu ZG93U2hlbGwuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVs bC5jcHAKaW5kZXggY2E2ZTVlMWY2YzRkM2JhZGM0ODI3OTM3ZDU5NDFkMDgwM2NmMzQzMS4uYjM4 NDliODIxMzc5ZWU2OTRmYmZjZGVlOTBlNGE2ODBkNWM4NzU3ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHAKQEAgLTY1LDYgKzY1LDE0IEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorI2lmbmRlZiBOREVCVUcKK3ZvaWQgVjhET01XaW5k b3dTaGVsbDo6YXNzZXJ0Q29udGV4dEhhc0NvcnJlY3RQcm90b3R5cGUoKQoreworICAgIEFTU0VS VChpc01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKFY4RE9NV3JhcHBlcjo6aXNXcmFwcGVyT2ZU eXBlKHRvSW5uZXJHbG9iYWxPYmplY3Qodjg6OkNvbnRleHQ6OkdldEVudGVyZWQoKSksICZWOERP TVdpbmRvdzo6aW5mbykpOworfQorI2VuZGlmCisKIHN0YXRpYyB2b2lkIGNoZWNrRG9jdW1lbnRX cmFwcGVyKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd3JhcHBlciwgRG9jdW1lbnQqIGRvY3VtZW50 KQogewogICAgIEFTU0VSVChWOERvY3VtZW50Ojp0b05hdGl2ZSh3cmFwcGVyKSA9PSBkb2N1bWVu dCk7CkBAIC0zMjgsNyArMzM2LDYgQEAgYm9vbCBWOERPTVdpbmRvd1NoZWxsOjppbnN0YWxsRE9N V2luZG93KCkKICAgICBWOERPTVdpbmRvdzo6aW5zdGFsbFBlckNvbnRleHRQcm9wZXJ0aWVzKHdp bmRvd1dyYXBwZXIsIHdpbmRvdyk7CiAKICAgICBWOERPTVdyYXBwZXI6OnNldERPTVdyYXBwZXIo djg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdCh3aW5kb3dXcmFwcGVyLT5HZXRQcm90b3R5cGUo KSksICZWOERPTVdpbmRvdzo6aW5mbywgd2luZG93KTsKLSAgICBWOERPTVdyYXBwZXI6OmNyZWF0 ZURPTVdyYXBwZXIoUGFzc1JlZlB0cjxET01XaW5kb3c+KHdpbmRvdyksICZWOERPTVdpbmRvdzo6 aW5mbywgd2luZG93V3JhcHBlcik7CiAKICAgICAvLyBJbnN0YWxsIHRoZSB3aW5kb3dXcmFwcGVy IGFzIHRoZSBwcm90b3R5cGUgb2YgdGhlIGlubmVyR2xvYmFsT2JqZWN0LgogICAgIC8vIFRoZSBm dWxsIHN0cnVjdHVyZSBvZiB0aGUgZ2xvYmFsIG9iamVjdCBpcyBhcyBmb2xsb3dzOgpAQCAtMzQ2 LDYgKzM1Myw3IEBAIGJvb2wgVjhET01XaW5kb3dTaGVsbDo6aW5zdGFsbERPTVdpbmRvdygpCiAg ICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBpbm5lckdsb2JhbE9iamVjdCA9IHRvSW5uZXJHbG9i YWxPYmplY3QobV9jb250ZXh0LmdldCgpKTsKICAgICBWOERPTVdyYXBwZXI6OnNldERPTVdyYXBw ZXIoaW5uZXJHbG9iYWxPYmplY3QsICZWOERPTVdpbmRvdzo6aW5mbywgd2luZG93KTsKICAgICBp bm5lckdsb2JhbE9iamVjdC0+U2V0UHJvdG90eXBlKHdpbmRvd1dyYXBwZXIpOworICAgIFY4RE9N V3JhcHBlcjo6Y3JlYXRlRE9NV3JhcHBlcihQYXNzUmVmUHRyPERPTVdpbmRvdz4od2luZG93KSwg JlY4RE9NV2luZG93OjppbmZvLCB3aW5kb3dXcmFwcGVyKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVs bC5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5oCmluZGV4 IGZiZTI1MmQzN2ZmODBiNGY1MDkwNzYyNjI3YTc3MTlmNGNjNjc3YmYuLjRmODMxN2U2MTExNDAx ZDcwNTRiMjg1NTE2ZTFjMWI5MjI4MDM0Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9WOERPTVdpbmRvd1NoZWxsLmgKQEAgLTgwLDggKzgwLDE1IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgZGVzdHJveUdsb2JhbCgpOwogCisjaWZuZGVmIE5ERUJVRworICAgIHN0YXRpYyB2b2lk IGFzc2VydENvbnRleHRIYXNDb3JyZWN0UHJvdG90eXBlKCk7CisjZW5kaWYKKwogICAgIHN0YXRp YyBWOERPTVdpbmRvd1NoZWxsKiBpc29sYXRlZCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250 ZXh0KQogICAgIHsKKyNpZm5kZWYgTkRFQlVHCisgICAgICAgIGFzc2VydENvbnRleHRIYXNDb3Jy ZWN0UHJvdG90eXBlKCk7CisjZW5kaWYKICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFY4RE9N V2luZG93U2hlbGwqPihjb250ZXh0LT5HZXRBbGlnbmVkUG9pbnRlckZyb21FbWJlZGRlckRhdGEo djhDb250ZXh0SXNvbGF0ZWRXaW5kb3dTaGVsbCkpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ybGRDb250ZXh0SGFuZGxlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmxkQ29udGV4dEhhbmRsZS5jcHAKaW5kZXggZTJmNjg3Yjg1 NzFmY2FhYjM3MmJhM2FkMmMxM2UxNDczZGYwNDZhZS4uMzBhOGNiMDgxMmMwNDE0Njc0NDExYjZh ZDZiYzk4YTVkNzExNDRiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv V29ybGRDb250ZXh0SGFuZGxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9X b3JsZENvbnRleHRIYW5kbGUuY3BwCkBAIC0zNSwyNyArMzUsMzggQEAKICNpbmNsdWRlICJWOEJp bmRpbmcuaCIKICNpbmNsdWRlICJWOERPTVdpbmRvdy5oIgogI2luY2x1ZGUgIlY4RE9NV2luZG93 U2hlbGwuaCIKKyNpbmNsdWRlICJWOERlZGljYXRlZFdvcmtlckNvbnRleHQuaCIKKyNpbmNsdWRl ICJWOFNoYXJlZFdvcmtlckNvbnRleHQuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBXb3Js ZENvbnRleHRIYW5kbGU6OldvcmxkQ29udGV4dEhhbmRsZShXb3JsZFRvVXNlIHdvcmxkVG9Vc2Up CiAgICAgOiBtX3dvcmxkVG9Vc2Uod29ybGRUb1VzZSkKIHsKKyAgICBBU1NFUlQod29ybGRUb1Vz ZSAhPSBVc2VXb3JrZXJXb3JsZCk7CisKICAgICBpZiAod29ybGRUb1VzZSA9PSBVc2VNYWluV29y bGQgfHwgd29ybGRUb1VzZSA9PSBVc2VXb3JrZXJXb3JsZCkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgaWYgKHY4OjpDb250ZXh0OjpJbkNvbnRleHQoKSkgewotICAgICAgICB2ODo6SGFuZGxlPHY4 OjpDb250ZXh0PiBjb250ZXh0ID0gdjg6OkNvbnRleHQ6OkdldEN1cnJlbnQoKTsKKyAgICBpZiAo IXY4OjpDb250ZXh0OjpJbkNvbnRleHQoKSkKKyAgICAgICAgQ1JBU0goKTsKKworICAgIHY4OjpI YW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQgPSB2ODo6Q29udGV4dDo6R2V0Q3VycmVudCgpOwog I2lmIEVOQUJMRShXT1JLRVJTKQotICAgICAgICBpZiAoVU5MSUtFTFkoIVY4RE9NV3JhcHBlcjo6 aXNXcmFwcGVyT2ZUeXBlKHRvSW5uZXJHbG9iYWxPYmplY3QoY29udGV4dCksICZWOERPTVdpbmRv dzo6aW5mbykpKSB7Ci0gICAgICAgICAgICBtX3dvcmxkVG9Vc2UgPSBVc2VXb3JrZXJXb3JsZDsK LSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAgIGlmIChVTkxJS0VMWSghVjhET01X cmFwcGVyOjppc1dyYXBwZXJPZlR5cGUodG9Jbm5lckdsb2JhbE9iamVjdChjb250ZXh0KSwgJlY4 RE9NV2luZG93OjppbmZvKSkpIHsKKyNpZiBFTkFCTEUoU0hBUkVEX1dPUktFUlMpCisgICAgICAg IEFTU0VSVChWOERPTVdyYXBwZXI6OmlzV3JhcHBlck9mVHlwZSh0b0lubmVyR2xvYmFsT2JqZWN0 KGNvbnRleHQpLT5HZXRQcm90b3R5cGUoKSwgJlY4RGVkaWNhdGVkV29ya2VyQ29udGV4dDo6aW5m bykgfHwgVjhET01XcmFwcGVyOjppc1dyYXBwZXJPZlR5cGUodG9Jbm5lckdsb2JhbE9iamVjdChj b250ZXh0KS0+R2V0UHJvdG90eXBlKCksICZWOFNoYXJlZFdvcmtlckNvbnRleHQ6OmluZm8pKTsK KyNlbHNlCisgICAgICAgIEFTU0VSVChWOERPTVdyYXBwZXI6OmlzV3JhcHBlck9mVHlwZSh0b0lu bmVyR2xvYmFsT2JqZWN0KGNvbnRleHQpLT5HZXRQcm90b3R5cGUoKSwgJlY4RGVkaWNhdGVkV29y a2VyQ29udGV4dDo6aW5mbykpOwogI2VuZGlmCi0gICAgICAgIGlmIChWOERPTVdpbmRvd1NoZWxs Ojppc29sYXRlZChjb250ZXh0KSkgewotICAgICAgICAgICAgbV9jb250ZXh0ID0gU2hhcmVkUGVy c2lzdGVudDx2ODo6Q29udGV4dD46OmNyZWF0ZShjb250ZXh0KTsKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgfQorICAgICAgICBtX3dvcmxkVG9Vc2UgPSBVc2VXb3JrZXJXb3JsZDsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKyNlbmRpZgorCisgICAgaWYgKFY4RE9NV2luZG93U2hlbGw6 Omlzb2xhdGVkKGNvbnRleHQpKSB7CisgICAgICAgIG1fY29udGV4dCA9IFNoYXJlZFBlcnNpc3Rl bnQ8djg6OkNvbnRleHQ+OjpjcmVhdGUoY29udGV4dCk7CisgICAgICAgIHJldHVybjsKICAgICB9 CiAKICAgICBtX3dvcmxkVG9Vc2UgPSBVc2VNYWluV29ybGQ7Cg== 175408 2012-11-21 03:57:49 -0800 2012-11-22 05:52:48 -0800 Patch bug-101573-20121121125535.patch text/plain 5619 dcarney U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1Mzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRmNmMzYzE2M2UyYWZk OTMyNzg5NjY0ZTcyMzZiNGRiOTgzNzgwOS4uMDE2ZmUwMmIxYjhhZjZmMzExMWY4ZjhmZjU0NDk4 NzliNjQ0YzhkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTExLTIxICBEYW4g Q2FybmV5ICA8ZGNhcm5leUBnb29nbGUuY29tPgorCisgICAgICAgIFtWOF0gQWRkIGNvbnRleHQg Y2hlY2tzIHRvIFdvcmxkQ29udGV4dEhhbmRsZSBhbmQgVjhET01XaW5kb3dTaGVsbAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNTczCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBBZGRlZCBhIGJ1bmNoIG9mIGFz c2VydGlvbnMgdG8gZW5zdXJlIHRoZSBwcm9ibGVtcyB3aXRoIEluZGV4ZWREQgorICAgICAgICBj b250ZXh0cyBjYW5ub3QgcmVlbWVyZ2UuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyBjaGFu Z2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4RE9NV2luZG93 U2hlbGwuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpWOERPTVdp bmRvd1NoZWxsOjphc3NlcnRDb250ZXh0SGFzQ29ycmVjdFByb3RvdHlwZSk6CisgICAgICAgICog YmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5oOgorICAgICAgICAoVjhET01XaW5kb3dTaGVs bCk6CisgICAgICAgIChXZWJDb3JlOjpWOERPTVdpbmRvd1NoZWxsOjppc29sYXRlZCk6CisgICAg ICAgICogYmluZGluZ3MvdjgvV29ybGRDb250ZXh0SGFuZGxlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OldvcmxkQ29udGV4dEhhbmRsZTo6V29ybGRDb250ZXh0SGFuZGxlKToKKwogMjAxMi0xMS0y MSAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBN b3ZlIFY4RE9NV2luZG93U2hlbGw6OmluaXRpYWxpemVWOElmTmVlZGVkKCkgdG8gVjhJbml0aWFs aXplcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dT aGVsbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNw cAppbmRleCBjYTZlNWUxZjZjNGQzYmFkYzQ4Mjc5MzdkNTk0MWQwODAzY2YzNDMxLi5iMzg0OWI4 MjEzNzllZTY5NGZiZmNkZWU5MGU0YTY4MGQ1Yzg3NTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcApAQCAtNjUsNiArNjUsMTQgQEAKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCisjaWZuZGVmIE5ERUJVRwordm9pZCBWOERPTVdpbmRvd1No ZWxsOjphc3NlcnRDb250ZXh0SGFzQ29ycmVjdFByb3RvdHlwZSgpCit7CisgICAgQVNTRVJUKGlz TWFpblRocmVhZCgpKTsKKyAgICBBU1NFUlQoVjhET01XcmFwcGVyOjppc1dyYXBwZXJPZlR5cGUo dG9Jbm5lckdsb2JhbE9iamVjdCh2ODo6Q29udGV4dDo6R2V0RW50ZXJlZCgpKSwgJlY4RE9NV2lu ZG93OjppbmZvKSk7Cit9CisjZW5kaWYKKwogc3RhdGljIHZvaWQgY2hlY2tEb2N1bWVudFdyYXBw ZXIodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiB3cmFwcGVyLCBEb2N1bWVudCogZG9jdW1lbnQpCiB7 CiAgICAgQVNTRVJUKFY4RG9jdW1lbnQ6OnRvTmF0aXZlKHdyYXBwZXIpID09IGRvY3VtZW50KTsK QEAgLTMyOCw3ICszMzYsNiBAQCBib29sIFY4RE9NV2luZG93U2hlbGw6Omluc3RhbGxET01XaW5k b3coKQogICAgIFY4RE9NV2luZG93OjppbnN0YWxsUGVyQ29udGV4dFByb3BlcnRpZXMod2luZG93 V3JhcHBlciwgd2luZG93KTsKIAogICAgIFY4RE9NV3JhcHBlcjo6c2V0RE9NV3JhcHBlcih2ODo6 SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KHdpbmRvd1dyYXBwZXItPkdldFByb3RvdHlwZSgpKSwg JlY4RE9NV2luZG93OjppbmZvLCB3aW5kb3cpOwotICAgIFY4RE9NV3JhcHBlcjo6Y3JlYXRlRE9N V3JhcHBlcihQYXNzUmVmUHRyPERPTVdpbmRvdz4od2luZG93KSwgJlY4RE9NV2luZG93OjppbmZv LCB3aW5kb3dXcmFwcGVyKTsKIAogICAgIC8vIEluc3RhbGwgdGhlIHdpbmRvd1dyYXBwZXIgYXMg dGhlIHByb3RvdHlwZSBvZiB0aGUgaW5uZXJHbG9iYWxPYmplY3QuCiAgICAgLy8gVGhlIGZ1bGwg c3RydWN0dXJlIG9mIHRoZSBnbG9iYWwgb2JqZWN0IGlzIGFzIGZvbGxvd3M6CkBAIC0zNDYsNiAr MzUzLDcgQEAgYm9vbCBWOERPTVdpbmRvd1NoZWxsOjppbnN0YWxsRE9NV2luZG93KCkKICAgICB2 ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGlubmVyR2xvYmFsT2JqZWN0ID0gdG9Jbm5lckdsb2JhbE9i amVjdChtX2NvbnRleHQuZ2V0KCkpOwogICAgIFY4RE9NV3JhcHBlcjo6c2V0RE9NV3JhcHBlcihp bm5lckdsb2JhbE9iamVjdCwgJlY4RE9NV2luZG93OjppbmZvLCB3aW5kb3cpOwogICAgIGlubmVy R2xvYmFsT2JqZWN0LT5TZXRQcm90b3R5cGUod2luZG93V3JhcHBlcik7CisgICAgVjhET01XcmFw cGVyOjpjcmVhdGVET01XcmFwcGVyKFBhc3NSZWZQdHI8RE9NV2luZG93Pih3aW5kb3cpLCAmVjhE T01XaW5kb3c6OmluZm8sIHdpbmRvd1dyYXBwZXIpOwogICAgIHJldHVybiB0cnVlOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmgg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmgKaW5kZXggZmJl MjUyZDM3ZmY4MGI0ZjUwOTA3NjI2MjdhNzcxOWY0Y2M2NzdiZi4uNGY4MzE3ZTYxMTE0MDFkNzA1 NGIyODU1MTZlMWMxYjkyMjgwMzRjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvVjhET01XaW5kb3dTaGVsbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4RE9NV2luZG93U2hlbGwuaApAQCAtODAsOCArODAsMTUgQEAgcHVibGljOgogCiAgICAgdm9p ZCBkZXN0cm95R2xvYmFsKCk7CiAKKyNpZm5kZWYgTkRFQlVHCisgICAgc3RhdGljIHZvaWQgYXNz ZXJ0Q29udGV4dEhhc0NvcnJlY3RQcm90b3R5cGUoKTsKKyNlbmRpZgorCiAgICAgc3RhdGljIFY4 RE9NV2luZG93U2hlbGwqIGlzb2xhdGVkKHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQp CiAgICAgeworI2lmbmRlZiBOREVCVUcKKyAgICAgICAgYXNzZXJ0Q29udGV4dEhhc0NvcnJlY3RQ cm90b3R5cGUoKTsKKyNlbmRpZgogICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8VjhET01XaW5k b3dTaGVsbCo+KGNvbnRleHQtPkdldEFsaWduZWRQb2ludGVyRnJvbUVtYmVkZGVyRGF0YSh2OENv bnRleHRJc29sYXRlZFdpbmRvd1NoZWxsKSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9Xb3JsZENvbnRleHRIYW5kbGUuY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvV29ybGRDb250ZXh0SGFuZGxlLmNwcAppbmRleCBlMmY2ODdiODU3MWZj YWFiMzcyYmEzYWQyYzEzZTE0NzNkZjA0NmFlLi4zMGE4Y2IwODEyYzA0MTQ2NzQ0MTFiNmFkNmJj OThhNWQ3MTE0NGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9Xb3Js ZENvbnRleHRIYW5kbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmxk Q29udGV4dEhhbmRsZS5jcHAKQEAgLTM1LDI3ICszNSwzOCBAQAogI2luY2x1ZGUgIlY4QmluZGlu Zy5oIgogI2luY2x1ZGUgIlY4RE9NV2luZG93LmgiCiAjaW5jbHVkZSAiVjhET01XaW5kb3dTaGVs bC5oIgorI2luY2x1ZGUgIlY4RGVkaWNhdGVkV29ya2VyQ29udGV4dC5oIgorI2luY2x1ZGUgIlY4 U2hhcmVkV29ya2VyQ29udGV4dC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFdvcmxkQ29u dGV4dEhhbmRsZTo6V29ybGRDb250ZXh0SGFuZGxlKFdvcmxkVG9Vc2Ugd29ybGRUb1VzZSkKICAg ICA6IG1fd29ybGRUb1VzZSh3b3JsZFRvVXNlKQogeworICAgIEFTU0VSVCh3b3JsZFRvVXNlICE9 IFVzZVdvcmtlcldvcmxkKTsKKwogICAgIGlmICh3b3JsZFRvVXNlID09IFVzZU1haW5Xb3JsZCB8 fCB3b3JsZFRvVXNlID09IFVzZVdvcmtlcldvcmxkKQogICAgICAgICByZXR1cm47CiAKLSAgICBp ZiAodjg6OkNvbnRleHQ6OkluQ29udGV4dCgpKSB7Ci0gICAgICAgIHY4OjpIYW5kbGU8djg6OkNv bnRleHQ+IGNvbnRleHQgPSB2ODo6Q29udGV4dDo6R2V0Q3VycmVudCgpOworICAgIGlmICghdjg6 OkNvbnRleHQ6OkluQ29udGV4dCgpKQorICAgICAgICBDUkFTSCgpOworCisgICAgdjg6OkhhbmRs ZTx2ODo6Q29udGV4dD4gY29udGV4dCA9IHY4OjpDb250ZXh0OjpHZXRDdXJyZW50KCk7CiAjaWYg RU5BQkxFKFdPUktFUlMpCi0gICAgICAgIGlmIChVTkxJS0VMWSghVjhET01XcmFwcGVyOjppc1dy YXBwZXJPZlR5cGUodG9Jbm5lckdsb2JhbE9iamVjdChjb250ZXh0KSwgJlY4RE9NV2luZG93Ojpp bmZvKSkpIHsKLSAgICAgICAgICAgIG1fd29ybGRUb1VzZSA9IFVzZVdvcmtlcldvcmxkOwotICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CisgICAgaWYgKFVOTElLRUxZKCFWOERPTVdyYXBw ZXI6OmlzV3JhcHBlck9mVHlwZSh0b0lubmVyR2xvYmFsT2JqZWN0KGNvbnRleHQpLCAmVjhET01X aW5kb3c6OmluZm8pKSkgeworI2lmIEVOQUJMRShTSEFSRURfV09SS0VSUykKKyAgICAgICAgQVNT RVJUKFY4RE9NV3JhcHBlcjo6aXNXcmFwcGVyT2ZUeXBlKHRvSW5uZXJHbG9iYWxPYmplY3QoY29u dGV4dCktPkdldFByb3RvdHlwZSgpLCAmVjhEZWRpY2F0ZWRXb3JrZXJDb250ZXh0OjppbmZvKSB8 fCBWOERPTVdyYXBwZXI6OmlzV3JhcHBlck9mVHlwZSh0b0lubmVyR2xvYmFsT2JqZWN0KGNvbnRl eHQpLT5HZXRQcm90b3R5cGUoKSwgJlY4U2hhcmVkV29ya2VyQ29udGV4dDo6aW5mbykpOworI2Vs c2UKKyAgICAgICAgQVNTRVJUKFY4RE9NV3JhcHBlcjo6aXNXcmFwcGVyT2ZUeXBlKHRvSW5uZXJH bG9iYWxPYmplY3QoY29udGV4dCktPkdldFByb3RvdHlwZSgpLCAmVjhEZWRpY2F0ZWRXb3JrZXJD b250ZXh0OjppbmZvKSk7CiAjZW5kaWYKLSAgICAgICAgaWYgKFY4RE9NV2luZG93U2hlbGw6Omlz b2xhdGVkKGNvbnRleHQpKSB7Ci0gICAgICAgICAgICBtX2NvbnRleHQgPSBTaGFyZWRQZXJzaXN0 ZW50PHY4OjpDb250ZXh0Pjo6Y3JlYXRlKGNvbnRleHQpOwotICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICB9CisgICAgICAgIG1fd29ybGRUb1VzZSA9IFVzZVdvcmtlcldvcmxkOworICAgICAg ICByZXR1cm47CisgICAgfQorI2VuZGlmCisKKyAgICBpZiAoVjhET01XaW5kb3dTaGVsbDo6aXNv bGF0ZWQoY29udGV4dCkpIHsKKyAgICAgICAgbV9jb250ZXh0ID0gU2hhcmVkUGVyc2lzdGVudDx2 ODo6Q29udGV4dD46OmNyZWF0ZShjb250ZXh0KTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KIAog ICAgIG1fd29ybGRUb1VzZSA9IFVzZU1haW5Xb3JsZDsK