117129 2013-06-02 14:38:42 -0700 [GTK] Parameters 'inResult' and 'resolver' from function 'webkit_dom_document_evaluate' should be allowed to be NULL 2013-06-06 06:39:29 -0700 1 1 1 Unclassified WebKit Bindings 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 dpino webkit-unassigned cdumez commit-queue xan.lopez oldest_to_newest 896273 0 dpino 2013-06-02 14:38:42 -0700 According to the spec http://www.w3.org/TR/DOM-Level-3-XPath/xpath.html Parameters 'inResult' and 'resolver' from function 'webkit_dom_document_evaluate' can be NULL. This bug was reported for the parameter 'inResult' in webk.it/42115 and a temporary fix that skipped the validation of this paramater was applied. Since there was no validation, the parameter was allowed to be NULL. 896275 1 203548 dpino 2013-06-02 15:09:33 -0700 Created attachment 203548 Patch 896276 2 commit-queue 2013-06-02 15:12:14 -0700 Attachment 203548 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm', u'Source/WebKit/gtk/ChangeLog', u'Source/WebKit/gtk/tests/testdomdocument.c']" exit_code: 1 Source/WebCore/ChangeLog:5: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] WARNING: File exempt from style guide. Skipping: "Source/WebKit/gtk/tests/testdomdocument.c" Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 896277 3 dpino 2013-06-02 15:15:34 -0700 The patch refactors the code of the temporary fix and moves the validation of nullability of parameters to the GetGReturnMacro function. A hash table keeps track of the parameters that are allowed to be NULL indexed by function name. This solution is more extensable, and it will allow to add more parameters which can be NULL in the future. Finally, a test for function 'dom_document_evaluate' was added. The test passes both parameter 'inResult' and 'resolver' as NULL. 896908 4 203548 xan.lopez 2013-06-04 08:22:10 -0700 Comment on attachment 203548 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203548&action=review Looks pretty good in general, just a few small comments. >> Source/WebCore/ChangeLog:5 >> + * Add test for function 'webkit_dom_document_evaluate' > > Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] I think the style bot is complaining because no text should appear above the title/uri combo. > Source/WebKit/gtk/ChangeLog:5 > + Add test for function 'webkit_dom_document_evaluate' Although no warning here, so not sure. Still this seems wrong. > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:49 > +my $can_be_null_params = { I think methods have to be in camel case. > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:864 > + } I think you can leave the original line and just prepend the !$paramName || thing if ParamCanBeNull is true, right? > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:885 > + } Can this actually happen? > Source/WebKit/gtk/tests/testdomdocument.c:227 > + 0, NULL, NULL); I'd just leave this in the previous line. 896909 5 xan.lopez 2013-06-04 08:23:09 -0700 (In reply to comment #4) > > Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm:49 > > +my $can_be_null_params = { > > I think methods have to be in camel case. Of course I meant variable names here. 896989 6 203715 dpino 2013-06-04 11:34:50 -0700 Created attachment 203715 Patch 897534 7 dpino 2013-06-05 13:50:37 -0700 On the last patch I forgot to include the Changelog :P 897535 8 203880 dpino 2013-06-05 13:51:14 -0700 Created attachment 203880 Patch 897715 9 203921 dpino 2013-06-06 03:55:01 -0700 Created attachment 203921 Patch 897716 10 dpino 2013-06-06 03:56:09 -0700 Modified 'ParamCanBeNull' function. Return 'false' if 'functionName' is not defined. 897720 11 203921 xan.lopez 2013-06-06 04:19:56 -0700 Comment on attachment 203921 Patch LGTM. 897722 12 203921 commit-queue 2013-06-06 04:21:16 -0700 Comment on attachment 203921 Patch Rejecting attachment 203921 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 203921, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/712640 897724 13 xan.lopez 2013-06-06 04:22:49 -0700 Ah, I think you actually need to remove the No new tests (OOPS!) thing :) (and we actually are adding tests anyway). 897726 14 203923 dpino 2013-06-06 04:41:57 -0700 Created attachment 203923 Patch 897739 15 203923 xan.lopez 2013-06-06 06:17:07 -0700 Comment on attachment 203923 Patch Looks good! 897748 16 203923 commit-queue 2013-06-06 06:39:26 -0700 Comment on attachment 203923 Patch Clearing flags on attachment: 203923 Committed r151267: <http://trac.webkit.org/changeset/151267> 897749 17 commit-queue 2013-06-06 06:39:29 -0700 All reviewed patches have been landed. Closing bug. 203548 2013-06-02 15:09:33 -0700 2013-06-04 11:34:43 -0700 Patch bug-117129-20130603000804.patch text/plain 8425 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwOTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA4ZDQ1OGZmOWYzNjFk YWY3YWVkY2ViMDQ0MTk3YmUzODgxYTc3OC4uZDRkNTNmMWVlNzhjYTc3NTliZWZlMjgxZjE5NGI5 NTA4Yjg1NzUwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTA2LTAyICBEaWVn byBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CisKKyAgICAgICAgUGFyYW1ldGVycyAn aW5SZXN1bHQnIGFuZCAncmVzb2x2ZXInIGluIGZ1bmN0aW9uICd3ZWJraXRfZG9tX2RvY3VtZW50 X2V2YWx1YXRlJyBjYW4gYmUgTlVMTAorCisgICAgICAgICogQWRkIHRlc3QgZm9yIGZ1bmN0aW9u ICd3ZWJraXRfZG9tX2RvY3VtZW50X2V2YWx1YXRlJworCisgICAgICAgIFtHVEtdIFBhcmFtZXRl cnMgJ2luUmVzdWx0JyBhbmQgJ3Jlc29sdmVyJyBmcm9tIGZ1bmN0aW9uICd3ZWJraXRfZG9tX2Rv Y3VtZW50X2V2YWx1YXRlJyBzaG91bGQgYmUgYWxsb3dlZCB0byBiZSBOVUxMCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTcxMjkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBdCB0aGlzIG1vbWVudCB0aGVy ZSB3YXMgYSB0ZW1wb3JhcnkgZml4IHRoYXQgYWxsb3dlZCBwYXJhbWV0ZXIKKyAgICAgICAgJ2lu UmVzdWx0JyB0byBiZSBOVUxMIChzZWU6IHdlYmsuaXQvNDIxMTUpLiBIb3dldmVyLCB0aGVyZSB3 YXMgbm8gZml4CisgICAgICAgIGZvciBwYXJhbWV0ZXIgJ3Jlc29sdmVyJy4KKworICAgICAgICBU aGlzIHBhdGNoIHJlZmFjdG9ycyB0aGUgY29kZSBvZiB0aGUgcHJldmlvdXMgZml4LCBtb3Zpbmcg dGhlIGNvZGUgZm9yCisgICAgICAgIGRldGVybWluZSB3aGV0aGVyIGEgcGFyYW1ldGVyIGNhbiBi ZSBOVUxMIG9yIG5vdCB0byBHZXRHUmV0dXJuTWFjcm8uCisgICAgICAgIFRoZSBzb2x1dGlvbiBp cyBxdWl0ZSBnZW5lcmFsIGFuZCB3aWxsIGFsb3cgdG8gYWRkIG90aGVyIHBhcmFtZXRlcnMgaW4K KyAgICAgICAgdGhlIGZ1dHVyZSBpZiBuZWVkZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChP T1BTISkuCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0 LnBtOgorICAgICAgICAoR2V0R1JldHVybk1hY3JvKTogUGFzcyBmdW5jdGlvbk5hbWUsIGFzIGlu IHNvbWUgY2FzZXMgdGhlIGNvZGUKKyAgICAgICAgZ2VuZXJhdGVkIGRlcGVuZHMgb24gdGhlIHBh cmFtTmFtZSBhbmQgdGhlIGZ1bmN0aW9uTmFtZQorICAgICAgICAoUGFyYW1DYW5CZU51bGwpOiBD aGVja3MgaWYgYSBwYXJhbWV0ZXIgaXMgYWxsb3dlZCB0byBiZSBOVUxMCisgICAgICAgIChHZW5l cmF0ZUZ1bmN0aW9uKToKKwogMjAxMy0wNS0zMCAgU2Vva2p1IEt3b24gIDxzZW9ranUua3dvbkBn bWFpbC5jb20+CiAKICAgICAgICAgUmVtb3ZlIG9ic29sZXRlIGZvcndhcmQgZGVjbGFyYXRpb24g ZnJvbSBJbnNwZWN0b3JGcm9udGVuZEhvc3QuaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9n dGsvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDA2YjliOTQx OTg1NTQ0NzQ4MTMyNDlmNTRjZjliYjdiNjE4MTk0MzkuLmJkNzMwMmI2YTRiMWMyNjc3YWY0OGQw Y2M3OGQ3ODA5MWNiMzllZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAx My0wNi0wMiAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgorCisgICAgICAg IFBhcmFtZXRlcnMgJ2luUmVzdWx0JyBhbmQgJ3Jlc29sdmVyJyBpbiBmdW5jdGlvbiAnd2Via2l0 X2RvbV9kb2N1bWVudF9ldmFsdWF0ZScgY2FuIGJlIE5VTEwKKworICAgICAgICBBZGQgdGVzdCBm b3IgZnVuY3Rpb24gJ3dlYmtpdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUnCisKKyAgICAgICAgW0dU S10gUGFyYW1ldGVycyAnaW5SZXN1bHQnIGFuZCAncmVzb2x2ZXInIGZyb20gZnVuY3Rpb24gJ3dl YmtpdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUnIHNob3VsZCBiZSBhbGxvd2VkIHRvIGJlIE5VTEwK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzEyOQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMv dGVzdGRvbWRvY3VtZW50LmM6IAorICAgICAgICAodGVzdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUp OiBDaGVja3MgZnVuY3Rpb24gZG9tX2RvY3VtZW50X2V2YWx1YXRlLAorICAgICAgICBleGVjdXRl cyBhbiBYUGF0aCBleHByZXNzaW9uIG9uIGEgSFRNTCBkb2N1bWVudAorICAgICAgICAobWFpbik6 CisKIDIwMTMtMDUtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFVwZGF0ZSBORVdTIGFuZCBWZXJzaW9ucy5tNCBmb3Ig Mi4xLjEgcmVsZWFzZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtCmluZGV4IDA2MjYzOWI2YjNjNDcyZTlmYmY2Mjc2 YTIxOGViOTlmMjIyYTc4ZTQuLjY2YTZjMTFjYjU5NGE1OWJkZGFlYjhkMzcxNGRmMTljZGY3ZTAz ZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvckdPYmplY3QucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9yR09iamVjdC5wbQpAQCAtNDUsNiArNDUsMTEgQEAgbXkgJWJhc2VUeXBlSGFzaCA9 ICgiT2JqZWN0IiA9PiAxLCAiTm9kZSIgPT4gMSwgIk5vZGVMaXN0IiA9PiAxLCAiTmFtZWROb2Rl TWFwIgogICAgICAgICAgICAgICAgICAgICAiTm9kZUl0ZXJhdG9yIiA9PiAxLCAiVHJlZVdhbGtl ciIgPT4gMSwgIkFic3RyYWN0VmlldyIgPT4gMSwgIkJsb2IiID0+IDEsICJET01Ub2tlbkxpc3Qi ID0+IDEsCiAgICAgICAgICAgICAgICAgICAgICJIVE1MQ29sbGVjdGlvbiIgPT4gMSk7CiAKKyMg TGlzdCBvZiBmdW5jdGlvbiBwYXJhbWV0ZXJzIHRoYXQgYXJlIGFsbG93ZWQgdG8gYmUgTlVMTAor bXkgJGNhbl9iZV9udWxsX3BhcmFtcyA9IHsKKyAgICAnd2Via2l0X2RvbV9kb2N1bWVudF9ldmFs dWF0ZScgPT4gWydpblJlc3VsdCcsICdyZXNvbHZlciddCit9OworCiAjIERlZmF1bHQgY29uc3Ry dWN0b3IKIHN1YiBuZXcgewogICAgIG15ICRvYmplY3QgPSBzaGlmdDsKQEAgLTg0NSwxNCArODUw LDE4IEBAIEVPRgogfQogCiBzdWIgR2V0R1JldHVybk1hY3JvIHsKLSAgICBteSAoJHBhcmFtTmFt ZSwgJHBhcmFtSURMVHlwZSwgJHJldHVyblR5cGUpID0gQF87CisgICAgbXkgKCRwYXJhbU5hbWUs ICRwYXJhbUlETFR5cGUsICRyZXR1cm5UeXBlLCAkZnVuY3Rpb25OYW1lKSA9IEBfOwogCiAgICAg bXkgJGNvbmRpdGlvbjsKICAgICBpZiAoJHBhcmFtSURMVHlwZSBlcSAiR0Vycm9yIikgewogICAg ICAgICAkY29uZGl0aW9uID0gIiEkcGFyYW1OYW1lIHx8ICEqJHBhcmFtTmFtZSI7CiAgICAgfSBl bHNpZiAoSXNHRE9NQ2xhc3NUeXBlKCRwYXJhbUlETFR5cGUpKSB7CiAgICAgICAgIG15ICRwYXJh bVR5cGVDYXBzID0gdWMoRml4VXBEZWNhbWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkcGFyYW1JRExU eXBlKSkpOwotICAgICAgICAkY29uZGl0aW9uID0gIldFQktJVF9ET01fSVNfJHtwYXJhbVR5cGVD YXBzfSgkcGFyYW1OYW1lKSI7CisgICAgICAgIGlmIChQYXJhbUNhbkJlTnVsbCgkZnVuY3Rpb25O YW1lLCAkcGFyYW1OYW1lKSkgeworICAgICAgICAgICAgJGNvbmRpdGlvbiA9ICIhJHBhcmFtTmFt ZSB8fCBXRUJLSVRfRE9NX0lTXyR7cGFyYW1UeXBlQ2Fwc30oJHBhcmFtTmFtZSkiOworICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgJGNvbmRpdGlvbiA9ICJXRUJLSVRfRE9NX0lTXyR7cGFy YW1UeXBlQ2Fwc30oJHBhcmFtTmFtZSkiOworICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAg ICAgJGNvbmRpdGlvbiA9ICIkcGFyYW1OYW1lIjsKICAgICB9CkBAIC04NjgsNiArODc3LDE1IEBA IHN1YiBHZXRHUmV0dXJuTWFjcm8gewogICAgIHJldHVybiAkbWFjcm87CiB9CiAKK3N1YiBQYXJh bUNhbkJlTnVsbCB7CisgICAgbXkoJGZ1bmN0aW9uTmFtZSwgJHBhcmFtTmFtZSkgPSBAXzsKKwor ICAgIGlmICghZGVmaW5lZCgkZnVuY3Rpb25OYW1lKSkgeworICAgICAgICAkZnVuY3Rpb25OYW1l ID0gIiI7CisgICAgfQorICAgIHJldHVybiBzY2FsYXIoZ3JlcCgvJHBhcmFtTmFtZS8sIEB7JGNh bl9iZV9udWxsX3BhcmFtcy0+eyRmdW5jdGlvbk5hbWV9fSkpOworfQorCiBzdWIgR2VuZXJhdGVG dW5jdGlvbiB7CiAgICAgbXkgKCRvYmplY3QsICRpbnRlcmZhY2VOYW1lLCAkZnVuY3Rpb24sICRw cmVmaXgsICRwYXJlbnROb2RlKSA9IEBfOwogCkBAIC05NzMsMTIgKzk5MSw4IEBAIHN1YiBHZW5l cmF0ZUZ1bmN0aW9uIHsKICAgICAgICAgbXkgJHBhcmFtVHlwZUlzUHJpbWl0aXZlID0gJGNvZGVH ZW5lcmF0b3ItPklzUHJpbWl0aXZlVHlwZSgkcGFyYW1JRExUeXBlKTsKICAgICAgICAgbXkgJHBh cmFtSXNHRE9NVHlwZSA9IElzR0RPTUNsYXNzVHlwZSgkcGFyYW1JRExUeXBlKTsKICAgICAgICAg aWYgKCEkcGFyYW1UeXBlSXNQcmltaXRpdmUpIHsKLSAgICAgICAgICAgICMgRklYTUU6IFRlbXBv cmFyeSBoYWNrIGZvciBnZW5lcmF0aW5nIGEgcHJvcGVyIGltcGxlbWVudGF0aW9uCi0gICAgICAg ICAgICAjICAgICAgICBvZiB0aGUgd2Via2l0X2RvbV9kb2N1bWVudF9ldmFsdWF0ZSBmdW5jdGlv biAoQnVnLUlEOiA0MjExNSkKLSAgICAgICAgICAgIGlmICghKCgkZnVuY3Rpb25OYW1lIGVxICJ3 ZWJraXRfZG9tX2RvY3VtZW50X2V2YWx1YXRlIikgJiYgKCRwYXJhbUlETFR5cGUgZXEgIlhQYXRo UmVzdWx0IikpKSB7Ci0gICAgICAgICAgICAgICAgJGdSZXR1cm5NYWNybyA9IEdldEdSZXR1cm5N YWNybygkcGFyYW1OYW1lLCAkcGFyYW1JRExUeXBlLCAkcmV0dXJuVHlwZSk7Ci0gICAgICAgICAg ICAgICAgcHVzaChAY0JvZHksICRnUmV0dXJuTWFjcm8pOwotICAgICAgICAgICAgfQorICAgICAg ICAgICAgJGdSZXR1cm5NYWNybyA9IEdldEdSZXR1cm5NYWNybygkcGFyYW1OYW1lLCAkcGFyYW1J RExUeXBlLCAkcmV0dXJuVHlwZSwgJGZ1bmN0aW9uTmFtZSk7CisgICAgICAgICAgICBwdXNoKEBj Qm9keSwgJGdSZXR1cm5NYWNybyk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3Rkb21kb2N1bWVudC5jIGIvU291cmNlL1dlYktpdC9n dGsvdGVzdHMvdGVzdGRvbWRvY3VtZW50LmMKaW5kZXggZTQwYTg5NWJjODY4ODU2YzNmOTgwMDNh MTJiNzA3NGMyMDIwNmU2YS4uYWEyNzdiNmVmZDc3NTBkZDRiOGMyYTYzM2Y2YzAxMzkyYTQ5MWJm ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGRvbWRvY3VtZW50LmMK KysrIGIvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGRvbWRvY3VtZW50LmMKQEAgLTMyLDYg KzMyLDcgQEAKICNkZWZpbmUgSFRNTF9ET0NVTUVOVF9MSU5LUyAiPGh0bWw+PGhlYWQ+PHRpdGxl PlRpdGxlPC90aXRsZT48L2hlYWQ+PGJvZHk+PGEgaHJlZj1cImFib3V0OmJsYW5rXCI+Ymxhbms8 L2E+PGEgaHJlZj1cImh0dHA6Ly93d3cuZ29vZ2xlLmNvbVwiPmdvb2dsZTwvYT48YSBocmVmPVwi aHR0cDovL3d3dy53ZWJraXQub3JnXCI+d2Via2l0PC9hPjwvYm9keT48L2h0bWw+IgogI2RlZmlu ZSBIVE1MX0RPQ1VNRU5UX0lGUkFNRSAiPGh0bWw+PGhlYWQ+PHRpdGxlPklGcmFtZTwvdGl0bGU+ PC9oZWFkPjxib2R5PjxpZnJhbWUgaWQ9J2lmcmFtZSc+PC9pZnJhbWU+PGRpdiBpZD0ndGVzdCc+ PC9kaXY+PC9ib2R5PjwvaHRtbD4iCiAjZGVmaW5lIEhUTUxfRE9DVU1FTlRfVEFCTEUgIjxodG1s Pjxib2R5Pjx0YWJsZSBpZD1cInRhYmxlXCI+PC90YWJsZT48L2JvZHk+PC9odG1sPiIKKyNkZWZp bmUgSFRNTF9ET0NVTUVOVF9FVkFMVUFURSAiPGh0bWw+PGhlYWQ+PHRpdGxlPjwvdGl0bGU+PC9o ZWFkPjxib2R5PjxkaXY+Rmlyc3QgZGl2PC9kaXY+PGRpdj5TZWNvbmQgZGl2PC9kaXY+PC9ib2R5 PjwvaHRtbD4iCiAKIHR5cGVkZWYgc3RydWN0IHsKICAgICBHdGtXaWRnZXQqIHdlYlZpZXc7CkBA IC0yMDgsNiArMjA5LDM3IEBAIHN0YXRpYyB2b2lkIHRlc3RfZG9tX2RvY3VtZW50X2luc2VydF9y b3coRG9tRG9jdW1lbnRGaXh0dXJlKiBmaXh0dXJlLCBnY29uc3Rwb2luCiAgICAgZ19hc3NlcnRf Y21waW50KHdlYmtpdF9kb21faHRtbF9jb2xsZWN0aW9uX2dldF9sZW5ndGgocm93cyksID09LCAx KTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUoRG9tRG9jdW1l bnRGaXh0dXJlKiBmaXh0dXJlLCBnY29uc3Rwb2ludGVyIGRhdGEpCit7CisgICAgZ19hc3NlcnQo Zml4dHVyZSk7CisgICAgV2ViS2l0V2ViVmlldyogdmlldyA9IChXZWJLaXRXZWJWaWV3KilmaXh0 dXJlLT53ZWJWaWV3OworICAgIGdfYXNzZXJ0KHZpZXcpOworICAgIFdlYktpdERPTURvY3VtZW50 KiBkb2N1bWVudCA9IHdlYmtpdF93ZWJfdmlld19nZXRfZG9tX2RvY3VtZW50KHZpZXcpOworICAg IGdfYXNzZXJ0KFdFQktJVF9ET01fSVNfRE9DVU1FTlQoZG9jdW1lbnQpKTsKKyAgICBXZWJLaXRE T01Ob2RlTGlzdCogbGlzdCA9IHdlYmtpdF9kb21fZG9jdW1lbnRfZ2V0X2VsZW1lbnRzX2J5X3Rh Z19uYW1lKGRvY3VtZW50LCAiaHRtbCIpOworICAgIGdfYXNzZXJ0KGxpc3QpOworICAgIGd1bG9u ZyBsZW5ndGggPSB3ZWJraXRfZG9tX25vZGVfbGlzdF9nZXRfbGVuZ3RoKGxpc3QpOworICAgIGdf YXNzZXJ0X2NtcGludChsZW5ndGgsID09LCAxKTsKKyAgICBXZWJLaXRET01Ob2RlKiBodG1sID0g d2Via2l0X2RvbV9ub2RlX2xpc3RfaXRlbShsaXN0LCAwKTsKKyAgICBnX2Fzc2VydChXRUJLSVRf RE9NX0lTX05PREUoaHRtbCkpOworCisgICAgV2ViS2l0RE9NWFBhdGhSZXN1bHQqIHJlc3VsdCA9 IHdlYmtpdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUoZG9jdW1lbnQsICIvL2RpdiIsIGh0bWwsIE5V TEwsIAorICAgICAgICAwLCBOVUxMLCBOVUxMKTsKKyAgICBnX2Fzc2VydChXRUJLSVRfRE9NX0lT X1hQQVRIX1JFU1VMVChyZXN1bHQpKTsKKworICAgIGludCBpID0gMDsKKyAgICBXZWJLaXRET01O b2RlKiBub2RlOworICAgIHdoaWxlICggKG5vZGUgPSB3ZWJraXRfZG9tX3hwYXRoX3Jlc3VsdF9p dGVyYXRlX25leHQocmVzdWx0LCBOVUxMKSkgIT0gTlVMTCkgeworICAgICAgICBnX2Fzc2VydChu b2RlKTsKKyAgICAgICAgV2ViS2l0RE9NRWxlbWVudCogZWxlbWVudCA9IChXZWJLaXRET01FbGVt ZW50Kilub2RlOworICAgICAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X2RvbV9lbGVtZW50X2dl dF90YWdfbmFtZShlbGVtZW50KSwgPT0sICJESVYiKTsKKyAgICAgICAgaSsrOworICAgIH0KKyAg ICBnX2Fzc2VydF9jbXBpbnQoaSwgPT0sIDIpOworCisgICAgZ19vYmplY3RfdW5yZWYobGlzdCk7 Cit9CisKIHN0YXRpYyB2b2lkIHdlYWtfbm90aWZ5KGdwb2ludGVyIGRhdGEsIEdPYmplY3QqIHpv bWJpZSkKIHsKICAgICBndWludCogY291bnQgPSAoZ3VpbnQqKWRhdGE7CkBAIC0zODAsNiArNDEy LDEyIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKICAgICAgICAgICAgICAgIHRl c3RfZG9tX2RvY3VtZW50X2luc2VydF9yb3csCiAgICAgICAgICAgICAgICBkb21fZG9jdW1lbnRf Zml4dHVyZV90ZWFyZG93bik7CiAKKyAgICBnX3Rlc3RfYWRkKCIvd2Via2l0L2RvbWRvY3VtZW50 L3Rlc3RfZG9jdW1lbnRfZXZhbHVhdGUiLAorICAgICAgICAgICAgICAgRG9tRG9jdW1lbnRGaXh0 dXJlLCBIVE1MX0RPQ1VNRU5UX0VWQUxVQVRFLAorICAgICAgICAgICAgICAgZG9tX2RvY3VtZW50 X2ZpeHR1cmVfc2V0dXAsCisgICAgICAgICAgICAgICB0ZXN0X2RvbV9kb2N1bWVudF9ldmFsdWF0 ZSwKKyAgICAgICAgICAgICAgIGRvbV9kb2N1bWVudF9maXh0dXJlX3RlYXJkb3duKTsKKwogICAg IGdfdGVzdF9hZGQoIi93ZWJraXQvZG9tZG9jdW1lbnQvdGVzdF9nYXJiYWdlX2NvbGxlY3Rpb24i LAogICAgICAgICAgICAgICAgRG9tRG9jdW1lbnRGaXh0dXJlLCBIVE1MX0RPQ1VNRU5UX0xJTktT LAogICAgICAgICAgICAgICAgZG9tX2RvY3VtZW50X2ZpeHR1cmVfc2V0dXAsCg== 203715 2013-06-04 11:34:50 -0700 2013-06-05 13:51:06 -0700 Patch bug-117129-20130604203319.patch text/plain 5665 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwOTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbQppbmRleCAwNjI2MzliNmIz YzQ3MmU5ZmJmNjI3NmEyMThlYjk5ZjIyMmE3OGU0Li41YjhhMDA0NmFjZjBjZWNlYTQ1NjZjOWQ3 YTg2NzY1ZmE2ZWY2MjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0KQEAgLTQ1LDYgKzQ1LDExIEBAIG15ICVi YXNlVHlwZUhhc2ggPSAoIk9iamVjdCIgPT4gMSwgIk5vZGUiID0+IDEsICJOb2RlTGlzdCIgPT4g MSwgIk5hbWVkTm9kZU1hcCIKICAgICAgICAgICAgICAgICAgICAgIk5vZGVJdGVyYXRvciIgPT4g MSwgIlRyZWVXYWxrZXIiID0+IDEsICJBYnN0cmFjdFZpZXciID0+IDEsICJCbG9iIiA9PiAxLCAi RE9NVG9rZW5MaXN0IiA9PiAxLAogICAgICAgICAgICAgICAgICAgICAiSFRNTENvbGxlY3Rpb24i ID0+IDEpOwogCisjIExpc3Qgb2YgZnVuY3Rpb24gcGFyYW1ldGVycyB0aGF0IGFyZSBhbGxvd2Vk IHRvIGJlIE5VTEwKK215ICRjYW5CZU51bGxQYXJhbXMgPSB7CisgICAgJ3dlYmtpdF9kb21fZG9j dW1lbnRfZXZhbHVhdGUnID0+IFsnaW5SZXN1bHQnLCAncmVzb2x2ZXInXQorfTsKKwogIyBEZWZh dWx0IGNvbnN0cnVjdG9yCiBzdWIgbmV3IHsKICAgICBteSAkb2JqZWN0ID0gc2hpZnQ7CkBAIC04 NDUsNyArODUwLDcgQEAgRU9GCiB9CiAKIHN1YiBHZXRHUmV0dXJuTWFjcm8gewotICAgIG15ICgk cGFyYW1OYW1lLCAkcGFyYW1JRExUeXBlLCAkcmV0dXJuVHlwZSkgPSBAXzsKKyAgICBteSAoJHBh cmFtTmFtZSwgJHBhcmFtSURMVHlwZSwgJHJldHVyblR5cGUsICRmdW5jdGlvbk5hbWUpID0gQF87 CiAKICAgICBteSAkY29uZGl0aW9uOwogICAgIGlmICgkcGFyYW1JRExUeXBlIGVxICJHRXJyb3Ii KSB7CkBAIC04NTMsNiArODU4LDkgQEAgc3ViIEdldEdSZXR1cm5NYWNybyB7CiAgICAgfSBlbHNp ZiAoSXNHRE9NQ2xhc3NUeXBlKCRwYXJhbUlETFR5cGUpKSB7CiAgICAgICAgIG15ICRwYXJhbVR5 cGVDYXBzID0gdWMoRml4VXBEZWNhbWVsaXplZE5hbWUoZGVjYW1lbGl6ZSgkcGFyYW1JRExUeXBl KSkpOwogICAgICAgICAkY29uZGl0aW9uID0gIldFQktJVF9ET01fSVNfJHtwYXJhbVR5cGVDYXBz fSgkcGFyYW1OYW1lKSI7CisgICAgICAgIGlmIChQYXJhbUNhbkJlTnVsbCgkZnVuY3Rpb25OYW1l LCAkcGFyYW1OYW1lKSkgeworICAgICAgICAgICAgJGNvbmRpdGlvbiA9ICIhJHBhcmFtTmFtZSB8 fCAkY29uZGl0aW9uIjsKKyAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgICRjb25kaXRp b24gPSAiJHBhcmFtTmFtZSI7CiAgICAgfQpAQCAtODY4LDYgKzg3NiwxNSBAQCBzdWIgR2V0R1Jl dHVybk1hY3JvIHsKICAgICByZXR1cm4gJG1hY3JvOwogfQogCitzdWIgUGFyYW1DYW5CZU51bGwg eworICAgIG15KCRmdW5jdGlvbk5hbWUsICRwYXJhbU5hbWUpID0gQF87CisKKyAgICBpZiAoIWRl ZmluZWQoJGZ1bmN0aW9uTmFtZSkpIHsKKyAgICAgICAgJGZ1bmN0aW9uTmFtZSA9ICIiOworICAg IH0KKyAgICByZXR1cm4gc2NhbGFyKGdyZXAoLyRwYXJhbU5hbWUvLCBAeyRjYW5CZU51bGxQYXJh bXMtPnskZnVuY3Rpb25OYW1lfX0pKTsKK30KKwogc3ViIEdlbmVyYXRlRnVuY3Rpb24gewogICAg IG15ICgkb2JqZWN0LCAkaW50ZXJmYWNlTmFtZSwgJGZ1bmN0aW9uLCAkcHJlZml4LCAkcGFyZW50 Tm9kZSkgPSBAXzsKIApAQCAtOTczLDEyICs5OTAsOCBAQCBzdWIgR2VuZXJhdGVGdW5jdGlvbiB7 CiAgICAgICAgIG15ICRwYXJhbVR5cGVJc1ByaW1pdGl2ZSA9ICRjb2RlR2VuZXJhdG9yLT5Jc1By aW1pdGl2ZVR5cGUoJHBhcmFtSURMVHlwZSk7CiAgICAgICAgIG15ICRwYXJhbUlzR0RPTVR5cGUg PSBJc0dET01DbGFzc1R5cGUoJHBhcmFtSURMVHlwZSk7CiAgICAgICAgIGlmICghJHBhcmFtVHlw ZUlzUHJpbWl0aXZlKSB7Ci0gICAgICAgICAgICAjIEZJWE1FOiBUZW1wb3JhcnkgaGFjayBmb3Ig Z2VuZXJhdGluZyBhIHByb3BlciBpbXBsZW1lbnRhdGlvbgotICAgICAgICAgICAgIyAgICAgICAg b2YgdGhlIHdlYmtpdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUgZnVuY3Rpb24gKEJ1Zy1JRDogNDIx MTUpCi0gICAgICAgICAgICBpZiAoISgoJGZ1bmN0aW9uTmFtZSBlcSAid2Via2l0X2RvbV9kb2N1 bWVudF9ldmFsdWF0ZSIpICYmICgkcGFyYW1JRExUeXBlIGVxICJYUGF0aFJlc3VsdCIpKSkgewot ICAgICAgICAgICAgICAgICRnUmV0dXJuTWFjcm8gPSBHZXRHUmV0dXJuTWFjcm8oJHBhcmFtTmFt ZSwgJHBhcmFtSURMVHlwZSwgJHJldHVyblR5cGUpOwotICAgICAgICAgICAgICAgIHB1c2goQGNC b2R5LCAkZ1JldHVybk1hY3JvKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgICRnUmV0dXJu TWFjcm8gPSBHZXRHUmV0dXJuTWFjcm8oJHBhcmFtTmFtZSwgJHBhcmFtSURMVHlwZSwgJHJldHVy blR5cGUsICRmdW5jdGlvbk5hbWUpOworICAgICAgICAgICAgcHVzaChAY0JvZHksICRnUmV0dXJu TWFjcm8pOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay90ZXN0cy90ZXN0ZG9tZG9jdW1lbnQuYyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3Rk b21kb2N1bWVudC5jCmluZGV4IGU0MGE4OTViYzg2ODg1NmMzZjk4MDAzYTEyYjcwNzRjMjAyMDZl NmEuLjU3MzE1OTMxNjk3NjA1ZTY3MWNhY2JlNmNjYWNlOGRmMGVlMDUwNjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3Rkb21kb2N1bWVudC5jCisrKyBiL1NvdXJjZS9X ZWJLaXQvZ3RrL3Rlc3RzL3Rlc3Rkb21kb2N1bWVudC5jCkBAIC0zMiw2ICszMiw3IEBACiAjZGVm aW5lIEhUTUxfRE9DVU1FTlRfTElOS1MgIjxodG1sPjxoZWFkPjx0aXRsZT5UaXRsZTwvdGl0bGU+ PC9oZWFkPjxib2R5PjxhIGhyZWY9XCJhYm91dDpibGFua1wiPmJsYW5rPC9hPjxhIGhyZWY9XCJo dHRwOi8vd3d3Lmdvb2dsZS5jb21cIj5nb29nbGU8L2E+PGEgaHJlZj1cImh0dHA6Ly93d3cud2Vi a2l0Lm9yZ1wiPndlYmtpdDwvYT48L2JvZHk+PC9odG1sPiIKICNkZWZpbmUgSFRNTF9ET0NVTUVO VF9JRlJBTUUgIjxodG1sPjxoZWFkPjx0aXRsZT5JRnJhbWU8L3RpdGxlPjwvaGVhZD48Ym9keT48 aWZyYW1lIGlkPSdpZnJhbWUnPjwvaWZyYW1lPjxkaXYgaWQ9J3Rlc3QnPjwvZGl2PjwvYm9keT48 L2h0bWw+IgogI2RlZmluZSBIVE1MX0RPQ1VNRU5UX1RBQkxFICI8aHRtbD48Ym9keT48dGFibGUg aWQ9XCJ0YWJsZVwiPjwvdGFibGU+PC9ib2R5PjwvaHRtbD4iCisjZGVmaW5lIEhUTUxfRE9DVU1F TlRfRVZBTFVBVEUgIjxodG1sPjxoZWFkPjx0aXRsZT48L3RpdGxlPjwvaGVhZD48Ym9keT48ZGl2 PkZpcnN0IGRpdjwvZGl2PjxkaXY+U2Vjb25kIGRpdjwvZGl2PjwvYm9keT48L2h0bWw+IgogCiB0 eXBlZGVmIHN0cnVjdCB7CiAgICAgR3RrV2lkZ2V0KiB3ZWJWaWV3OwpAQCAtMjA4LDYgKzIwOSwz NiBAQCBzdGF0aWMgdm9pZCB0ZXN0X2RvbV9kb2N1bWVudF9pbnNlcnRfcm93KERvbURvY3VtZW50 Rml4dHVyZSogZml4dHVyZSwgZ2NvbnN0cG9pbgogICAgIGdfYXNzZXJ0X2NtcGludCh3ZWJraXRf ZG9tX2h0bWxfY29sbGVjdGlvbl9nZXRfbGVuZ3RoKHJvd3MpLCA9PSwgMSk7CiB9CiAKK3N0YXRp YyB2b2lkIHRlc3RfZG9tX2RvY3VtZW50X2V2YWx1YXRlKERvbURvY3VtZW50Rml4dHVyZSogZml4 dHVyZSwgZ2NvbnN0cG9pbnRlciBkYXRhKQoreworICAgIGdfYXNzZXJ0KGZpeHR1cmUpOworICAg IFdlYktpdFdlYlZpZXcqIHZpZXcgPSAoV2ViS2l0V2ViVmlldyopZml4dHVyZS0+d2ViVmlldzsK KyAgICBnX2Fzc2VydCh2aWV3KTsKKyAgICBXZWJLaXRET01Eb2N1bWVudCogZG9jdW1lbnQgPSB3 ZWJraXRfd2ViX3ZpZXdfZ2V0X2RvbV9kb2N1bWVudCh2aWV3KTsKKyAgICBnX2Fzc2VydChXRUJL SVRfRE9NX0lTX0RPQ1VNRU5UKGRvY3VtZW50KSk7CisgICAgV2ViS2l0RE9NTm9kZUxpc3QqIGxp c3QgPSB3ZWJraXRfZG9tX2RvY3VtZW50X2dldF9lbGVtZW50c19ieV90YWdfbmFtZShkb2N1bWVu dCwgImh0bWwiKTsKKyAgICBnX2Fzc2VydChsaXN0KTsKKyAgICBndWxvbmcgbGVuZ3RoID0gd2Vi a2l0X2RvbV9ub2RlX2xpc3RfZ2V0X2xlbmd0aChsaXN0KTsKKyAgICBnX2Fzc2VydF9jbXBpbnQo bGVuZ3RoLCA9PSwgMSk7CisgICAgV2ViS2l0RE9NTm9kZSogaHRtbCA9IHdlYmtpdF9kb21fbm9k ZV9saXN0X2l0ZW0obGlzdCwgMCk7CisgICAgZ19hc3NlcnQoV0VCS0lUX0RPTV9JU19OT0RFKGh0 bWwpKTsKKworICAgIFdlYktpdERPTVhQYXRoUmVzdWx0KiByZXN1bHQgPSB3ZWJraXRfZG9tX2Rv Y3VtZW50X2V2YWx1YXRlKGRvY3VtZW50LCAiLy9kaXYiLCBodG1sLCBOVUxMLCAwLCBOVUxMLCBO VUxMKTsKKyAgICBnX2Fzc2VydChXRUJLSVRfRE9NX0lTX1hQQVRIX1JFU1VMVChyZXN1bHQpKTsK KworICAgIGludCBpID0gMDsKKyAgICBXZWJLaXRET01Ob2RlKiBub2RlOworICAgIHdoaWxlICgg KG5vZGUgPSB3ZWJraXRfZG9tX3hwYXRoX3Jlc3VsdF9pdGVyYXRlX25leHQocmVzdWx0LCBOVUxM KSkgIT0gTlVMTCkgeworICAgICAgICBnX2Fzc2VydChub2RlKTsKKyAgICAgICAgV2ViS2l0RE9N RWxlbWVudCogZWxlbWVudCA9IChXZWJLaXRET01FbGVtZW50Kilub2RlOworICAgICAgICBnX2Fz c2VydF9jbXBzdHIod2Via2l0X2RvbV9lbGVtZW50X2dldF90YWdfbmFtZShlbGVtZW50KSwgPT0s ICJESVYiKTsKKyAgICAgICAgaSsrOworICAgIH0KKyAgICBnX2Fzc2VydF9jbXBpbnQoaSwgPT0s IDIpOworCisgICAgZ19vYmplY3RfdW5yZWYobGlzdCk7Cit9CisKIHN0YXRpYyB2b2lkIHdlYWtf bm90aWZ5KGdwb2ludGVyIGRhdGEsIEdPYmplY3QqIHpvbWJpZSkKIHsKICAgICBndWludCogY291 bnQgPSAoZ3VpbnQqKWRhdGE7CkBAIC0zODAsNiArNDExLDEyIEBAIGludCBtYWluKGludCBhcmdj LCBjaGFyKiogYXJndikKICAgICAgICAgICAgICAgIHRlc3RfZG9tX2RvY3VtZW50X2luc2VydF9y b3csCiAgICAgICAgICAgICAgICBkb21fZG9jdW1lbnRfZml4dHVyZV90ZWFyZG93bik7CiAKKyAg ICBnX3Rlc3RfYWRkKCIvd2Via2l0L2RvbWRvY3VtZW50L3Rlc3RfZG9jdW1lbnRfZXZhbHVhdGUi LAorICAgICAgICAgICAgICAgRG9tRG9jdW1lbnRGaXh0dXJlLCBIVE1MX0RPQ1VNRU5UX0VWQUxV QVRFLAorICAgICAgICAgICAgICAgZG9tX2RvY3VtZW50X2ZpeHR1cmVfc2V0dXAsCisgICAgICAg ICAgICAgICB0ZXN0X2RvbV9kb2N1bWVudF9ldmFsdWF0ZSwKKyAgICAgICAgICAgICAgIGRvbV9k b2N1bWVudF9maXh0dXJlX3RlYXJkb3duKTsKKwogICAgIGdfdGVzdF9hZGQoIi93ZWJraXQvZG9t ZG9jdW1lbnQvdGVzdF9nYXJiYWdlX2NvbGxlY3Rpb24iLAogICAgICAgICAgICAgICAgRG9tRG9j dW1lbnRGaXh0dXJlLCBIVE1MX0RPQ1VNRU5UX0xJTktTLAogICAgICAgICAgICAgICAgZG9tX2Rv Y3VtZW50X2ZpeHR1cmVfc2V0dXAsCg== 203880 2013-06-05 13:51:14 -0700 2013-06-06 03:54:53 -0700 Patch bug-117129-20130605224942.patch text/plain 7931 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwOTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA4ZDQ1OGZmOWYzNjFk YWY3YWVkY2ViMDQ0MTk3YmUzODgxYTc3OC4uN2E3MzliYTFiNDFiZDk1YWU1YWE2ZGYzMmMzODlm M2M2NTBmNTM0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTA2LTA0ICBEaWVn byBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gUGFyYW1l dGVycyAnaW5SZXN1bHQnIGFuZCAncmVzb2x2ZXInIGZyb20gZnVuY3Rpb24gJ3dlYmtpdF9kb21f ZG9jdW1lbnRfZXZhbHVhdGUnIHNob3VsZCBiZSBhbGxvd2VkIHRvIGJlIE5VTEwKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzEyOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF0IHRoaXMgbW9tZW50IHRo ZXJlIHdhcyBhIHRlbXBvcmFyeSBmaXggdGhhdCBhbGxvd2VkIHBhcmFtZXRlcgorICAgICAgICAn aW5SZXN1bHQnIHRvIGJlIE5VTEwgKHNlZTogd2Viay5pdC80MjExNSkuIEhvd2V2ZXIsIHRoZXJl IHdhcyBubyBmaXgKKyAgICAgICAgZm9yIHBhcmFtZXRlciAncmVzb2x2ZXInLgorCisgICAgICAg IFRoaXMgcGF0Y2ggcmVmYWN0b3JzIHRoZSBjb2RlIG9mIHRoZSBwcmV2aW91cyBmaXgsIG1vdmlu ZyB0aGUgY29kZSBmb3IKKyAgICAgICAgZGV0ZXJtaW5lIHdoZXRoZXIgYSBwYXJhbWV0ZXIgY2Fu IGJlIE5VTEwgb3Igbm90IHRvIEdldEdSZXR1cm5NYWNyby4KKyAgICAgICAgVGhlIHNvbHV0aW9u IGlzIHF1aXRlIGdlbmVyYWwgYW5kIHdpbGwgYWxvdyB0byBhZGQgb3RoZXIgcGFyYW1ldGVycyBp bgorICAgICAgICB0aGUgZnV0dXJlIGlmIG5lZWRlZC4KKworICAgICAgICAqIGJpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG06CisgICAgICAgIChHZXRHUmV0dXJuTWFjcm8p OiBQYXNzIGZ1bmN0aW9uTmFtZSwgYXMgaW4gc29tZSBjYXNlcyB0aGUgY29kZQorICAgICAgICBn ZW5lcmF0ZWQgZGVwZW5kcyBvbiB0aGUgcGFyYW1OYW1lIGFuZCB0aGUgZnVuY3Rpb25OYW1lCisg ICAgICAgIChQYXJhbUNhbkJlTnVsbCk6IENoZWNrcyBpZiBhIHBhcmFtZXRlciBpcyBhbGxvd2Vk IHRvIGJlIE5VTEwKKyAgICAgICAgKEdlbmVyYXRlRnVuY3Rpb24pOgorCiAyMDEzLTA1LTMwICBT ZW9ranUgS3dvbiAgPHNlb2tqdS5rd29uQGdtYWlsLmNvbT4KIAogICAgICAgICBSZW1vdmUgb2Jz b2xldGUgZm9yd2FyZCBkZWNsYXJhdGlvbiBmcm9tIEluc3BlY3RvckZyb250ZW5kSG9zdC5oCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cKaW5kZXggMDZiOWI5NDE5ODU1NDQ3NDgxMzI0OWY1NGNmOWJiN2I2MTgxOTQz OS4uMmM5NGQyY2M5ZWZlYTk3NzFlYTYzZmJlMmI0OGFkNDJkYTNiZDYyYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA2LTA0ICBEaWVnbyBQaW5vIEdhcmNpYSAgPGRw aW5vQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gUGFyYW1ldGVycyAnaW5SZXN1bHQnIGFu ZCAncmVzb2x2ZXInIGZyb20gZnVuY3Rpb24gJ3dlYmtpdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUn IHNob3VsZCBiZSBhbGxvd2VkIHRvIGJlIE5VTEwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzEyOQorCisgICAgICAgIEFkZCB0ZXN0IGZvciBmdW5j dGlvbiAnd2Via2l0X2RvbV9kb2N1bWVudF9ldmFsdWF0ZScuCisKKyAgICAgICAgKiB0ZXN0cy90 ZXN0ZG9tZG9jdW1lbnQuYzoKKyAgICAgICAgKHRlc3RfZG9tX2RvY3VtZW50X2V2YWx1YXRlKTog Q2hlY2tzIGZ1bmN0aW9uIGRvbV9kb2N1bWVudF9ldmFsdWF0ZSwKKyAgICAgICAgZXhlY3V0ZXMg YW4gWFBhdGggZXhwcmVzc2lvbiBvbiBhIEhUTUwgZG9jdW1lbnQuCisgICAgICAgIChtYWluKToK KwogMjAxMy0wNS0yOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZC4gVXBkYXRlIE5FV1MgYW5kIFZlcnNpb25zLm00IGZvciAy LjEuMSByZWxlYXNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0KaW5kZXggMDYyNjM5YjZiM2M0NzJlOWZiZjYyNzZh MjE4ZWI5OWYyMjJhNzhlNC4uNWI4YTAwNDZhY2YwY2VjZWE0NTY2YzlkN2E4Njc2NWZhNmVmNjIx NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yR09iamVjdC5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JHT2JqZWN0LnBtCkBAIC00NSw2ICs0NSwxMSBAQCBteSAlYmFzZVR5cGVIYXNoID0g KCJPYmplY3QiID0+IDEsICJOb2RlIiA9PiAxLCAiTm9kZUxpc3QiID0+IDEsICJOYW1lZE5vZGVN YXAiCiAgICAgICAgICAgICAgICAgICAgICJOb2RlSXRlcmF0b3IiID0+IDEsICJUcmVlV2Fsa2Vy IiA9PiAxLCAiQWJzdHJhY3RWaWV3IiA9PiAxLCAiQmxvYiIgPT4gMSwgIkRPTVRva2VuTGlzdCIg PT4gMSwKICAgICAgICAgICAgICAgICAgICAgIkhUTUxDb2xsZWN0aW9uIiA9PiAxKTsKIAorIyBM aXN0IG9mIGZ1bmN0aW9uIHBhcmFtZXRlcnMgdGhhdCBhcmUgYWxsb3dlZCB0byBiZSBOVUxMCitt eSAkY2FuQmVOdWxsUGFyYW1zID0geworICAgICd3ZWJraXRfZG9tX2RvY3VtZW50X2V2YWx1YXRl JyA9PiBbJ2luUmVzdWx0JywgJ3Jlc29sdmVyJ10KK307CisKICMgRGVmYXVsdCBjb25zdHJ1Y3Rv cgogc3ViIG5ldyB7CiAgICAgbXkgJG9iamVjdCA9IHNoaWZ0OwpAQCAtODQ1LDcgKzg1MCw3IEBA IEVPRgogfQogCiBzdWIgR2V0R1JldHVybk1hY3JvIHsKLSAgICBteSAoJHBhcmFtTmFtZSwgJHBh cmFtSURMVHlwZSwgJHJldHVyblR5cGUpID0gQF87CisgICAgbXkgKCRwYXJhbU5hbWUsICRwYXJh bUlETFR5cGUsICRyZXR1cm5UeXBlLCAkZnVuY3Rpb25OYW1lKSA9IEBfOwogCiAgICAgbXkgJGNv bmRpdGlvbjsKICAgICBpZiAoJHBhcmFtSURMVHlwZSBlcSAiR0Vycm9yIikgewpAQCAtODUzLDYg Kzg1OCw5IEBAIHN1YiBHZXRHUmV0dXJuTWFjcm8gewogICAgIH0gZWxzaWYgKElzR0RPTUNsYXNz VHlwZSgkcGFyYW1JRExUeXBlKSkgewogICAgICAgICBteSAkcGFyYW1UeXBlQ2FwcyA9IHVjKEZp eFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJHBhcmFtSURMVHlwZSkpKTsKICAgICAgICAg JGNvbmRpdGlvbiA9ICJXRUJLSVRfRE9NX0lTXyR7cGFyYW1UeXBlQ2Fwc30oJHBhcmFtTmFtZSki OworICAgICAgICBpZiAoUGFyYW1DYW5CZU51bGwoJGZ1bmN0aW9uTmFtZSwgJHBhcmFtTmFtZSkp IHsKKyAgICAgICAgICAgICRjb25kaXRpb24gPSAiISRwYXJhbU5hbWUgfHwgJGNvbmRpdGlvbiI7 CisgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICAkY29uZGl0aW9uID0gIiRwYXJhbU5h bWUiOwogICAgIH0KQEAgLTg2OCw2ICs4NzYsMTUgQEAgc3ViIEdldEdSZXR1cm5NYWNybyB7CiAg ICAgcmV0dXJuICRtYWNybzsKIH0KIAorc3ViIFBhcmFtQ2FuQmVOdWxsIHsKKyAgICBteSgkZnVu Y3Rpb25OYW1lLCAkcGFyYW1OYW1lKSA9IEBfOworCisgICAgaWYgKCFkZWZpbmVkKCRmdW5jdGlv bk5hbWUpKSB7CisgICAgICAgICRmdW5jdGlvbk5hbWUgPSAiIjsKKyAgICB9CisgICAgcmV0dXJu IHNjYWxhcihncmVwKC8kcGFyYW1OYW1lLywgQHskY2FuQmVOdWxsUGFyYW1zLT57JGZ1bmN0aW9u TmFtZX19KSk7Cit9CisKIHN1YiBHZW5lcmF0ZUZ1bmN0aW9uIHsKICAgICBteSAoJG9iamVjdCwg JGludGVyZmFjZU5hbWUsICRmdW5jdGlvbiwgJHByZWZpeCwgJHBhcmVudE5vZGUpID0gQF87CiAK QEAgLTk3MywxMiArOTkwLDggQEAgc3ViIEdlbmVyYXRlRnVuY3Rpb24gewogICAgICAgICBteSAk cGFyYW1UeXBlSXNQcmltaXRpdmUgPSAkY29kZUdlbmVyYXRvci0+SXNQcmltaXRpdmVUeXBlKCRw YXJhbUlETFR5cGUpOwogICAgICAgICBteSAkcGFyYW1Jc0dET01UeXBlID0gSXNHRE9NQ2xhc3NU eXBlKCRwYXJhbUlETFR5cGUpOwogICAgICAgICBpZiAoISRwYXJhbVR5cGVJc1ByaW1pdGl2ZSkg ewotICAgICAgICAgICAgIyBGSVhNRTogVGVtcG9yYXJ5IGhhY2sgZm9yIGdlbmVyYXRpbmcgYSBw cm9wZXIgaW1wbGVtZW50YXRpb24KLSAgICAgICAgICAgICMgICAgICAgIG9mIHRoZSB3ZWJraXRf ZG9tX2RvY3VtZW50X2V2YWx1YXRlIGZ1bmN0aW9uIChCdWctSUQ6IDQyMTE1KQotICAgICAgICAg ICAgaWYgKCEoKCRmdW5jdGlvbk5hbWUgZXEgIndlYmtpdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUi KSAmJiAoJHBhcmFtSURMVHlwZSBlcSAiWFBhdGhSZXN1bHQiKSkpIHsKLSAgICAgICAgICAgICAg ICAkZ1JldHVybk1hY3JvID0gR2V0R1JldHVybk1hY3JvKCRwYXJhbU5hbWUsICRwYXJhbUlETFR5 cGUsICRyZXR1cm5UeXBlKTsKLSAgICAgICAgICAgICAgICBwdXNoKEBjQm9keSwgJGdSZXR1cm5N YWNybyk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICAkZ1JldHVybk1hY3JvID0gR2V0R1Jl dHVybk1hY3JvKCRwYXJhbU5hbWUsICRwYXJhbUlETFR5cGUsICRyZXR1cm5UeXBlLCAkZnVuY3Rp b25OYW1lKTsKKyAgICAgICAgICAgIHB1c2goQGNCb2R5LCAkZ1JldHVybk1hY3JvKTsKICAgICAg ICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGRv bWRvY3VtZW50LmMgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0ZG9tZG9jdW1lbnQuYwpp bmRleCBlNDBhODk1YmM4Njg4NTZjM2Y5ODAwM2ExMmI3MDc0YzIwMjA2ZTZhLi41NzMxNTkzMTY5 NzYwNWU2NzFjYWNiZTZjY2FjZThkZjBlZTA1MDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2d0ay90ZXN0cy90ZXN0ZG9tZG9jdW1lbnQuYworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0 cy90ZXN0ZG9tZG9jdW1lbnQuYwpAQCAtMzIsNiArMzIsNyBAQAogI2RlZmluZSBIVE1MX0RPQ1VN RU5UX0xJTktTICI8aHRtbD48aGVhZD48dGl0bGU+VGl0bGU8L3RpdGxlPjwvaGVhZD48Ym9keT48 YSBocmVmPVwiYWJvdXQ6YmxhbmtcIj5ibGFuazwvYT48YSBocmVmPVwiaHR0cDovL3d3dy5nb29n bGUuY29tXCI+Z29vZ2xlPC9hPjxhIGhyZWY9XCJodHRwOi8vd3d3LndlYmtpdC5vcmdcIj53ZWJr aXQ8L2E+PC9ib2R5PjwvaHRtbD4iCiAjZGVmaW5lIEhUTUxfRE9DVU1FTlRfSUZSQU1FICI8aHRt bD48aGVhZD48dGl0bGU+SUZyYW1lPC90aXRsZT48L2hlYWQ+PGJvZHk+PGlmcmFtZSBpZD0naWZy YW1lJz48L2lmcmFtZT48ZGl2IGlkPSd0ZXN0Jz48L2Rpdj48L2JvZHk+PC9odG1sPiIKICNkZWZp bmUgSFRNTF9ET0NVTUVOVF9UQUJMRSAiPGh0bWw+PGJvZHk+PHRhYmxlIGlkPVwidGFibGVcIj48 L3RhYmxlPjwvYm9keT48L2h0bWw+IgorI2RlZmluZSBIVE1MX0RPQ1VNRU5UX0VWQUxVQVRFICI8 aHRtbD48aGVhZD48dGl0bGU+PC90aXRsZT48L2hlYWQ+PGJvZHk+PGRpdj5GaXJzdCBkaXY8L2Rp dj48ZGl2PlNlY29uZCBkaXY8L2Rpdj48L2JvZHk+PC9odG1sPiIKIAogdHlwZWRlZiBzdHJ1Y3Qg ewogICAgIEd0a1dpZGdldCogd2ViVmlldzsKQEAgLTIwOCw2ICsyMDksMzYgQEAgc3RhdGljIHZv aWQgdGVzdF9kb21fZG9jdW1lbnRfaW5zZXJ0X3JvdyhEb21Eb2N1bWVudEZpeHR1cmUqIGZpeHR1 cmUsIGdjb25zdHBvaW4KICAgICBnX2Fzc2VydF9jbXBpbnQod2Via2l0X2RvbV9odG1sX2NvbGxl Y3Rpb25fZ2V0X2xlbmd0aChyb3dzKSwgPT0sIDEpOwogfQogCitzdGF0aWMgdm9pZCB0ZXN0X2Rv bV9kb2N1bWVudF9ldmFsdWF0ZShEb21Eb2N1bWVudEZpeHR1cmUqIGZpeHR1cmUsIGdjb25zdHBv aW50ZXIgZGF0YSkKK3sKKyAgICBnX2Fzc2VydChmaXh0dXJlKTsKKyAgICBXZWJLaXRXZWJWaWV3 KiB2aWV3ID0gKFdlYktpdFdlYlZpZXcqKWZpeHR1cmUtPndlYlZpZXc7CisgICAgZ19hc3NlcnQo dmlldyk7CisgICAgV2ViS2l0RE9NRG9jdW1lbnQqIGRvY3VtZW50ID0gd2Via2l0X3dlYl92aWV3 X2dldF9kb21fZG9jdW1lbnQodmlldyk7CisgICAgZ19hc3NlcnQoV0VCS0lUX0RPTV9JU19ET0NV TUVOVChkb2N1bWVudCkpOworICAgIFdlYktpdERPTU5vZGVMaXN0KiBsaXN0ID0gd2Via2l0X2Rv bV9kb2N1bWVudF9nZXRfZWxlbWVudHNfYnlfdGFnX25hbWUoZG9jdW1lbnQsICJodG1sIik7Cisg ICAgZ19hc3NlcnQobGlzdCk7CisgICAgZ3Vsb25nIGxlbmd0aCA9IHdlYmtpdF9kb21fbm9kZV9s aXN0X2dldF9sZW5ndGgobGlzdCk7CisgICAgZ19hc3NlcnRfY21waW50KGxlbmd0aCwgPT0sIDEp OworICAgIFdlYktpdERPTU5vZGUqIGh0bWwgPSB3ZWJraXRfZG9tX25vZGVfbGlzdF9pdGVtKGxp c3QsIDApOworICAgIGdfYXNzZXJ0KFdFQktJVF9ET01fSVNfTk9ERShodG1sKSk7CisKKyAgICBX ZWJLaXRET01YUGF0aFJlc3VsdCogcmVzdWx0ID0gd2Via2l0X2RvbV9kb2N1bWVudF9ldmFsdWF0 ZShkb2N1bWVudCwgIi8vZGl2IiwgaHRtbCwgTlVMTCwgMCwgTlVMTCwgTlVMTCk7CisgICAgZ19h c3NlcnQoV0VCS0lUX0RPTV9JU19YUEFUSF9SRVNVTFQocmVzdWx0KSk7CisKKyAgICBpbnQgaSA9 IDA7CisgICAgV2ViS2l0RE9NTm9kZSogbm9kZTsKKyAgICB3aGlsZSAoIChub2RlID0gd2Via2l0 X2RvbV94cGF0aF9yZXN1bHRfaXRlcmF0ZV9uZXh0KHJlc3VsdCwgTlVMTCkpICE9IE5VTEwpIHsK KyAgICAgICAgZ19hc3NlcnQobm9kZSk7CisgICAgICAgIFdlYktpdERPTUVsZW1lbnQqIGVsZW1l bnQgPSAoV2ViS2l0RE9NRWxlbWVudCopbm9kZTsKKyAgICAgICAgZ19hc3NlcnRfY21wc3RyKHdl YmtpdF9kb21fZWxlbWVudF9nZXRfdGFnX25hbWUoZWxlbWVudCksID09LCAiRElWIik7CisgICAg ICAgIGkrKzsKKyAgICB9CisgICAgZ19hc3NlcnRfY21waW50KGksID09LCAyKTsKKworICAgIGdf b2JqZWN0X3VucmVmKGxpc3QpOworfQorCiBzdGF0aWMgdm9pZCB3ZWFrX25vdGlmeShncG9pbnRl ciBkYXRhLCBHT2JqZWN0KiB6b21iaWUpCiB7CiAgICAgZ3VpbnQqIGNvdW50ID0gKGd1aW50Kilk YXRhOwpAQCAtMzgwLDYgKzQxMSwxMiBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3Yp CiAgICAgICAgICAgICAgICB0ZXN0X2RvbV9kb2N1bWVudF9pbnNlcnRfcm93LAogICAgICAgICAg ICAgICAgZG9tX2RvY3VtZW50X2ZpeHR1cmVfdGVhcmRvd24pOwogCisgICAgZ190ZXN0X2FkZCgi L3dlYmtpdC9kb21kb2N1bWVudC90ZXN0X2RvY3VtZW50X2V2YWx1YXRlIiwKKyAgICAgICAgICAg ICAgIERvbURvY3VtZW50Rml4dHVyZSwgSFRNTF9ET0NVTUVOVF9FVkFMVUFURSwKKyAgICAgICAg ICAgICAgIGRvbV9kb2N1bWVudF9maXh0dXJlX3NldHVwLAorICAgICAgICAgICAgICAgdGVzdF9k b21fZG9jdW1lbnRfZXZhbHVhdGUsCisgICAgICAgICAgICAgICBkb21fZG9jdW1lbnRfZml4dHVy ZV90ZWFyZG93bik7CisKICAgICBnX3Rlc3RfYWRkKCIvd2Via2l0L2RvbWRvY3VtZW50L3Rlc3Rf Z2FyYmFnZV9jb2xsZWN0aW9uIiwKICAgICAgICAgICAgICAgIERvbURvY3VtZW50Rml4dHVyZSwg SFRNTF9ET0NVTUVOVF9MSU5LUywKICAgICAgICAgICAgICAgIGRvbV9kb2N1bWVudF9maXh0dXJl X3NldHVwLAo= 203921 2013-06-06 03:55:01 -0700 2013-06-06 04:41:47 -0700 Patch bug-117129-20130606125329.patch text/plain 8031 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMjYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQwYTMyYjU0YWRlMzYx Zjk5M2E0NGJiOGI1MmIxNGI0MDIyOGI1Mi4uZGM4MTI0ZTUwMjM5MjM4NGQwNDhkNDMwNDcyN2Zm NTEzNjllNzJjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA2LTA2ICBEaWVn byBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gUGFyYW1l dGVycyAnaW5SZXN1bHQnIGFuZCAncmVzb2x2ZXInIGZyb20gZnVuY3Rpb24gJ3dlYmtpdF9kb21f ZG9jdW1lbnRfZXZhbHVhdGUnIHNob3VsZCBiZSBhbGxvd2VkIHRvIGJlIE5VTEwKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzEyOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF0IHRoaXMgbW9tZW50IHRo ZXJlIHdhcyBhIHRlbXBvcmFyeSBmaXggdGhhdCBhbGxvd2VkIHBhcmFtZXRlcgorICAgICAgICAn aW5SZXN1bHQnIHRvIGJlIE5VTEwgKHNlZTogd2Viay5pdC80MjExNSkuIEhvd2V2ZXIsIHRoZXJl IHdhcyBubyBmaXgKKyAgICAgICAgZm9yIHBhcmFtZXRlciAncmVzb2x2ZXInLgorICAgICAgICAK KyAgICAgICAgVGhpcyBwYXRjaCByZWZhY3RvcnMgdGhlIGNvZGUgb2YgdGhlIHByZXZpb3VzIGZp eCwgbW92aW5nIHRoZSBjb2RlIGZvcgorICAgICAgICBkZXRlcm1pbmUgd2hldGhlciBhIHBhcmFt ZXRlciBjYW4gYmUgTlVMTCBvciBub3QgdG8gR2V0R1JldHVybk1hY3JvLgorICAgICAgICBUaGUg c29sdXRpb24gaXMgcXVpdGUgZ2VuZXJhbCBhbmQgd2lsbCBhbG93IHRvIGFkZCBvdGhlciBwYXJh bWV0ZXJzIGluCisgICAgICAgIHRoZSBmdXR1cmUgaWYgbmVlZGVkLiAKKworICAgICAgICBObyBu ZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvckdPYmplY3QucG06CisgICAgICAgIChHZXRHUmV0dXJuTWFjcm8pOiBQYXNzIGZ1bmN0aW9u TmFtZSwgYXMgaW4gc29tZSBjYXNlcyB0aGUgY29kZQorICAgICAgICBnZW5lcmF0ZWQgZGVwZW5k cyBvbiB0aGUgcGFyYW1OYW1lIGFuZCB0aGUgZnVuY3Rpb25OYW1lCisgICAgICAgIChQYXJhbUNh bkJlTnVsbCk6IENoZWNrcyBpZiBhIHBhcmFtZXRlciBpcyBhbGxvd2VkIHRvIGJlIE5VTEwgCisg ICAgICAgIChHZW5lcmF0ZUZ1bmN0aW9uKToKKwogMjAxMy0wNi0wNSAgUnlvc3VrZSBOaXdhICA8 cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZlcnQgdGhlIHNlY29uZCBoYWxmIG9mIHIx NTEyNTcuIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y3JlYXRlIGNhbiByZXR1cm4gbnVsbC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZ3Rr L0NoYW5nZUxvZwppbmRleCBmNzNmNGE2ZDVjNjM5YTM0MTE0ZmU0NmJlMTRmYzFmZDFmOThhYzEy Li44MjBiOWQxZWVkMTI1Mjc1OTAwZTIwOGE1ZjYyOTNkNDIzZjAwNWIzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMDYtMDYgIERpZWdvIFBpbm8gR2FyY2lhICA8ZHBp bm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBQYXJhbWV0ZXJzICdpblJlc3VsdCcgYW5k ICdyZXNvbHZlcicgZnJvbSBmdW5jdGlvbiAnd2Via2l0X2RvbV9kb2N1bWVudF9ldmFsdWF0ZScg c2hvdWxkIGJlIGFsbG93ZWQgdG8gYmUgTlVMTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MTI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgZm9yIGZ1bmN0aW9uICd3ZWJraXRfZG9tX2Rv Y3VtZW50X2V2YWx1YXRlJy4KKworICAgICAgICAqIHRlc3RzL3Rlc3Rkb21kb2N1bWVudC5jOgor ICAgICAgICAodGVzdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUpOiBDaGVja3MgZnVuY3Rpb24gZG9t X2RvY3VtZW50X2V2YWx1YXRlLAorICAgICAgICBleGVjdXRlcyBhbiBYUGF0aCBleHByZXNzaW9u IG9uIGEgSFRNTCBkb2N1bWVudC4KKyAgICAgICAgKG1haW4pOiAKKwogMjAxMy0wNi0wNSAgQWxi ZXJ0byBHYXJjaWEgIDxhZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6IGZpeCBsYXllckZsdXNoVGltZXJGaXJlZENhbGxiYWNr IGNvbmRpdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9D b2RlR2VuZXJhdG9yR09iamVjdC5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckdPYmplY3QucG0KaW5kZXggMDYyNjM5YjZiM2M0NzJlOWZiZjYyNzZhMjE4 ZWI5OWYyMjJhNzhlNC4uOWY5NzdiNTEyODNiNThmYzkzMTJiYjgzMmQ2NzdjMmY4MmUwN2QxOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y R09iamVjdC5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5l cmF0b3JHT2JqZWN0LnBtCkBAIC00NSw2ICs0NSwxMSBAQCBteSAlYmFzZVR5cGVIYXNoID0gKCJP YmplY3QiID0+IDEsICJOb2RlIiA9PiAxLCAiTm9kZUxpc3QiID0+IDEsICJOYW1lZE5vZGVNYXAi CiAgICAgICAgICAgICAgICAgICAgICJOb2RlSXRlcmF0b3IiID0+IDEsICJUcmVlV2Fsa2VyIiA9 PiAxLCAiQWJzdHJhY3RWaWV3IiA9PiAxLCAiQmxvYiIgPT4gMSwgIkRPTVRva2VuTGlzdCIgPT4g MSwKICAgICAgICAgICAgICAgICAgICAgIkhUTUxDb2xsZWN0aW9uIiA9PiAxKTsKIAorIyBMaXN0 IG9mIGZ1bmN0aW9uIHBhcmFtZXRlcnMgdGhhdCBhcmUgYWxsb3dlZCB0byBiZSBOVUxMCitteSAk Y2FuQmVOdWxsUGFyYW1zID0geworICAgICd3ZWJraXRfZG9tX2RvY3VtZW50X2V2YWx1YXRlJyA9 PiBbJ2luUmVzdWx0JywgJ3Jlc29sdmVyJ10KK307CisKICMgRGVmYXVsdCBjb25zdHJ1Y3Rvcgog c3ViIG5ldyB7CiAgICAgbXkgJG9iamVjdCA9IHNoaWZ0OwpAQCAtODQ1LDcgKzg1MCw3IEBAIEVP RgogfQogCiBzdWIgR2V0R1JldHVybk1hY3JvIHsKLSAgICBteSAoJHBhcmFtTmFtZSwgJHBhcmFt SURMVHlwZSwgJHJldHVyblR5cGUpID0gQF87CisgICAgbXkgKCRwYXJhbU5hbWUsICRwYXJhbUlE TFR5cGUsICRyZXR1cm5UeXBlLCAkZnVuY3Rpb25OYW1lKSA9IEBfOwogCiAgICAgbXkgJGNvbmRp dGlvbjsKICAgICBpZiAoJHBhcmFtSURMVHlwZSBlcSAiR0Vycm9yIikgewpAQCAtODUzLDYgKzg1 OCw5IEBAIHN1YiBHZXRHUmV0dXJuTWFjcm8gewogICAgIH0gZWxzaWYgKElzR0RPTUNsYXNzVHlw ZSgkcGFyYW1JRExUeXBlKSkgewogICAgICAgICBteSAkcGFyYW1UeXBlQ2FwcyA9IHVjKEZpeFVw RGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJHBhcmFtSURMVHlwZSkpKTsKICAgICAgICAgJGNv bmRpdGlvbiA9ICJXRUJLSVRfRE9NX0lTXyR7cGFyYW1UeXBlQ2Fwc30oJHBhcmFtTmFtZSkiOwor ICAgICAgICBpZiAoUGFyYW1DYW5CZU51bGwoJGZ1bmN0aW9uTmFtZSwgJHBhcmFtTmFtZSkpIHsK KyAgICAgICAgICAgICRjb25kaXRpb24gPSAiISRwYXJhbU5hbWUgfHwgJGNvbmRpdGlvbiI7Cisg ICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICAkY29uZGl0aW9uID0gIiRwYXJhbU5hbWUi OwogICAgIH0KQEAgLTg2OCw2ICs4NzYsMTUgQEAgc3ViIEdldEdSZXR1cm5NYWNybyB7CiAgICAg cmV0dXJuICRtYWNybzsKIH0KIAorc3ViIFBhcmFtQ2FuQmVOdWxsIHsKKyAgICBteSgkZnVuY3Rp b25OYW1lLCAkcGFyYW1OYW1lKSA9IEBfOworCisgICAgaWYgKGRlZmluZWQoJGZ1bmN0aW9uTmFt ZSkpIHsKKyAgICAgICAgcmV0dXJuIHNjYWxhcihncmVwKC8kcGFyYW1OYW1lLywgQHskY2FuQmVO dWxsUGFyYW1zLT57JGZ1bmN0aW9uTmFtZX19KSk7CisgICAgfQorICAgIHJldHVybiAwOworfQor CiBzdWIgR2VuZXJhdGVGdW5jdGlvbiB7CiAgICAgbXkgKCRvYmplY3QsICRpbnRlcmZhY2VOYW1l LCAkZnVuY3Rpb24sICRwcmVmaXgsICRwYXJlbnROb2RlKSA9IEBfOwogCkBAIC05NzMsMTIgKzk5 MCw4IEBAIHN1YiBHZW5lcmF0ZUZ1bmN0aW9uIHsKICAgICAgICAgbXkgJHBhcmFtVHlwZUlzUHJp bWl0aXZlID0gJGNvZGVHZW5lcmF0b3ItPklzUHJpbWl0aXZlVHlwZSgkcGFyYW1JRExUeXBlKTsK ICAgICAgICAgbXkgJHBhcmFtSXNHRE9NVHlwZSA9IElzR0RPTUNsYXNzVHlwZSgkcGFyYW1JRExU eXBlKTsKICAgICAgICAgaWYgKCEkcGFyYW1UeXBlSXNQcmltaXRpdmUpIHsKLSAgICAgICAgICAg ICMgRklYTUU6IFRlbXBvcmFyeSBoYWNrIGZvciBnZW5lcmF0aW5nIGEgcHJvcGVyIGltcGxlbWVu dGF0aW9uCi0gICAgICAgICAgICAjICAgICAgICBvZiB0aGUgd2Via2l0X2RvbV9kb2N1bWVudF9l dmFsdWF0ZSBmdW5jdGlvbiAoQnVnLUlEOiA0MjExNSkKLSAgICAgICAgICAgIGlmICghKCgkZnVu Y3Rpb25OYW1lIGVxICJ3ZWJraXRfZG9tX2RvY3VtZW50X2V2YWx1YXRlIikgJiYgKCRwYXJhbUlE TFR5cGUgZXEgIlhQYXRoUmVzdWx0IikpKSB7Ci0gICAgICAgICAgICAgICAgJGdSZXR1cm5NYWNy byA9IEdldEdSZXR1cm5NYWNybygkcGFyYW1OYW1lLCAkcGFyYW1JRExUeXBlLCAkcmV0dXJuVHlw ZSk7Ci0gICAgICAgICAgICAgICAgcHVzaChAY0JvZHksICRnUmV0dXJuTWFjcm8pOwotICAgICAg ICAgICAgfQorICAgICAgICAgICAgJGdSZXR1cm5NYWNybyA9IEdldEdSZXR1cm5NYWNybygkcGFy YW1OYW1lLCAkcGFyYW1JRExUeXBlLCAkcmV0dXJuVHlwZSwgJGZ1bmN0aW9uTmFtZSk7CisgICAg ICAgICAgICBwdXNoKEBjQm9keSwgJGdSZXR1cm5NYWNybyk7CiAgICAgICAgIH0KICAgICB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3Rkb21kb2N1bWVudC5jIGIv U291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGRvbWRvY3VtZW50LmMKaW5kZXggZTQwYTg5NWJj ODY4ODU2YzNmOTgwMDNhMTJiNzA3NGMyMDIwNmU2YS4uNTczMTU5MzE2OTc2MDVlNjcxY2FjYmU2 Y2NhY2U4ZGYwZWUwNTA2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVz dGRvbWRvY3VtZW50LmMKKysrIGIvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGRvbWRvY3Vt ZW50LmMKQEAgLTMyLDYgKzMyLDcgQEAKICNkZWZpbmUgSFRNTF9ET0NVTUVOVF9MSU5LUyAiPGh0 bWw+PGhlYWQ+PHRpdGxlPlRpdGxlPC90aXRsZT48L2hlYWQ+PGJvZHk+PGEgaHJlZj1cImFib3V0 OmJsYW5rXCI+Ymxhbms8L2E+PGEgaHJlZj1cImh0dHA6Ly93d3cuZ29vZ2xlLmNvbVwiPmdvb2ds ZTwvYT48YSBocmVmPVwiaHR0cDovL3d3dy53ZWJraXQub3JnXCI+d2Via2l0PC9hPjwvYm9keT48 L2h0bWw+IgogI2RlZmluZSBIVE1MX0RPQ1VNRU5UX0lGUkFNRSAiPGh0bWw+PGhlYWQ+PHRpdGxl PklGcmFtZTwvdGl0bGU+PC9oZWFkPjxib2R5PjxpZnJhbWUgaWQ9J2lmcmFtZSc+PC9pZnJhbWU+ PGRpdiBpZD0ndGVzdCc+PC9kaXY+PC9ib2R5PjwvaHRtbD4iCiAjZGVmaW5lIEhUTUxfRE9DVU1F TlRfVEFCTEUgIjxodG1sPjxib2R5Pjx0YWJsZSBpZD1cInRhYmxlXCI+PC90YWJsZT48L2JvZHk+ PC9odG1sPiIKKyNkZWZpbmUgSFRNTF9ET0NVTUVOVF9FVkFMVUFURSAiPGh0bWw+PGhlYWQ+PHRp dGxlPjwvdGl0bGU+PC9oZWFkPjxib2R5PjxkaXY+Rmlyc3QgZGl2PC9kaXY+PGRpdj5TZWNvbmQg ZGl2PC9kaXY+PC9ib2R5PjwvaHRtbD4iCiAKIHR5cGVkZWYgc3RydWN0IHsKICAgICBHdGtXaWRn ZXQqIHdlYlZpZXc7CkBAIC0yMDgsNiArMjA5LDM2IEBAIHN0YXRpYyB2b2lkIHRlc3RfZG9tX2Rv Y3VtZW50X2luc2VydF9yb3coRG9tRG9jdW1lbnRGaXh0dXJlKiBmaXh0dXJlLCBnY29uc3Rwb2lu CiAgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF9kb21faHRtbF9jb2xsZWN0aW9uX2dldF9sZW5n dGgocm93cyksID09LCAxKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdF9kb21fZG9jdW1lbnRfZXZh bHVhdGUoRG9tRG9jdW1lbnRGaXh0dXJlKiBmaXh0dXJlLCBnY29uc3Rwb2ludGVyIGRhdGEpCit7 CisgICAgZ19hc3NlcnQoZml4dHVyZSk7CisgICAgV2ViS2l0V2ViVmlldyogdmlldyA9IChXZWJL aXRXZWJWaWV3KilmaXh0dXJlLT53ZWJWaWV3OworICAgIGdfYXNzZXJ0KHZpZXcpOworICAgIFdl YktpdERPTURvY3VtZW50KiBkb2N1bWVudCA9IHdlYmtpdF93ZWJfdmlld19nZXRfZG9tX2RvY3Vt ZW50KHZpZXcpOworICAgIGdfYXNzZXJ0KFdFQktJVF9ET01fSVNfRE9DVU1FTlQoZG9jdW1lbnQp KTsKKyAgICBXZWJLaXRET01Ob2RlTGlzdCogbGlzdCA9IHdlYmtpdF9kb21fZG9jdW1lbnRfZ2V0 X2VsZW1lbnRzX2J5X3RhZ19uYW1lKGRvY3VtZW50LCAiaHRtbCIpOworICAgIGdfYXNzZXJ0KGxp c3QpOworICAgIGd1bG9uZyBsZW5ndGggPSB3ZWJraXRfZG9tX25vZGVfbGlzdF9nZXRfbGVuZ3Ro KGxpc3QpOworICAgIGdfYXNzZXJ0X2NtcGludChsZW5ndGgsID09LCAxKTsKKyAgICBXZWJLaXRE T01Ob2RlKiBodG1sID0gd2Via2l0X2RvbV9ub2RlX2xpc3RfaXRlbShsaXN0LCAwKTsKKyAgICBn X2Fzc2VydChXRUJLSVRfRE9NX0lTX05PREUoaHRtbCkpOworCisgICAgV2ViS2l0RE9NWFBhdGhS ZXN1bHQqIHJlc3VsdCA9IHdlYmtpdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUoZG9jdW1lbnQsICIv L2RpdiIsIGh0bWwsIE5VTEwsIDAsIE5VTEwsIE5VTEwpOworICAgIGdfYXNzZXJ0KFdFQktJVF9E T01fSVNfWFBBVEhfUkVTVUxUKHJlc3VsdCkpOworCisgICAgaW50IGkgPSAwOworICAgIFdlYktp dERPTU5vZGUqIG5vZGU7CisgICAgd2hpbGUgKCAobm9kZSA9IHdlYmtpdF9kb21feHBhdGhfcmVz dWx0X2l0ZXJhdGVfbmV4dChyZXN1bHQsIE5VTEwpKSAhPSBOVUxMKSB7CisgICAgICAgIGdfYXNz ZXJ0KG5vZGUpOworICAgICAgICBXZWJLaXRET01FbGVtZW50KiBlbGVtZW50ID0gKFdlYktpdERP TUVsZW1lbnQqKW5vZGU7CisgICAgICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfZG9tX2VsZW1l bnRfZ2V0X3RhZ19uYW1lKGVsZW1lbnQpLCA9PSwgIkRJViIpOworICAgICAgICBpKys7CisgICAg fQorICAgIGdfYXNzZXJ0X2NtcGludChpLCA9PSwgMik7CisKKyAgICBnX29iamVjdF91bnJlZihs aXN0KTsKK30KKwogc3RhdGljIHZvaWQgd2Vha19ub3RpZnkoZ3BvaW50ZXIgZGF0YSwgR09iamVj dCogem9tYmllKQogewogICAgIGd1aW50KiBjb3VudCA9IChndWludCopZGF0YTsKQEAgLTM4MCw2 ICs0MTEsMTIgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogICAgICAgICAgICAg ICAgdGVzdF9kb21fZG9jdW1lbnRfaW5zZXJ0X3JvdywKICAgICAgICAgICAgICAgIGRvbV9kb2N1 bWVudF9maXh0dXJlX3RlYXJkb3duKTsKIAorICAgIGdfdGVzdF9hZGQoIi93ZWJraXQvZG9tZG9j dW1lbnQvdGVzdF9kb2N1bWVudF9ldmFsdWF0ZSIsCisgICAgICAgICAgICAgICBEb21Eb2N1bWVu dEZpeHR1cmUsIEhUTUxfRE9DVU1FTlRfRVZBTFVBVEUsCisgICAgICAgICAgICAgICBkb21fZG9j dW1lbnRfZml4dHVyZV9zZXR1cCwKKyAgICAgICAgICAgICAgIHRlc3RfZG9tX2RvY3VtZW50X2V2 YWx1YXRlLAorICAgICAgICAgICAgICAgZG9tX2RvY3VtZW50X2ZpeHR1cmVfdGVhcmRvd24pOwor CiAgICAgZ190ZXN0X2FkZCgiL3dlYmtpdC9kb21kb2N1bWVudC90ZXN0X2dhcmJhZ2VfY29sbGVj dGlvbiIsCiAgICAgICAgICAgICAgICBEb21Eb2N1bWVudEZpeHR1cmUsIEhUTUxfRE9DVU1FTlRf TElOS1MsCiAgICAgICAgICAgICAgICBkb21fZG9jdW1lbnRfZml4dHVyZV9zZXR1cCwK 203923 2013-06-06 04:41:57 -0700 2013-06-06 06:39:26 -0700 Patch bug-117129-20130606134024.patch text/plain 7998 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMjYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQwYTMyYjU0YWRlMzYx Zjk5M2E0NGJiOGI1MmIxNGI0MDIyOGI1Mi4uMGM2ZTE0MWRmZTk1MTY2OGE4MWEwZWUxMTkxNDI5 NjVlZmE4MGE2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTA2LTA2ICBEaWVn byBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gUGFyYW1l dGVycyAnaW5SZXN1bHQnIGFuZCAncmVzb2x2ZXInIGZyb20gZnVuY3Rpb24gJ3dlYmtpdF9kb21f ZG9jdW1lbnRfZXZhbHVhdGUnIHNob3VsZCBiZSBhbGxvd2VkIHRvIGJlIE5VTEwKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzEyOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEF0IHRoaXMgbW9tZW50IHRo ZXJlIHdhcyBhIHRlbXBvcmFyeSBmaXggdGhhdCBhbGxvd2VkIHBhcmFtZXRlcgorICAgICAgICAn aW5SZXN1bHQnIHRvIGJlIE5VTEwgKHNlZTogd2Viay5pdC80MjExNSkuIEhvd2V2ZXIsIHRoZXJl IHdhcyBubyBmaXgKKyAgICAgICAgZm9yIHBhcmFtZXRlciAncmVzb2x2ZXInLgorICAgICAgICAK KyAgICAgICAgVGhpcyBwYXRjaCByZWZhY3RvcnMgdGhlIGNvZGUgb2YgdGhlIHByZXZpb3VzIGZp eCwgbW92aW5nIHRoZSBjb2RlIGZvcgorICAgICAgICBkZXRlcm1pbmUgd2hldGhlciBhIHBhcmFt ZXRlciBjYW4gYmUgTlVMTCBvciBub3QgdG8gR2V0R1JldHVybk1hY3JvLgorICAgICAgICBUaGUg c29sdXRpb24gaXMgcXVpdGUgZ2VuZXJhbCBhbmQgd2lsbCBhbG93IHRvIGFkZCBvdGhlciBwYXJh bWV0ZXJzIGluCisgICAgICAgIHRoZSBmdXR1cmUgaWYgbmVlZGVkLiAKKworICAgICAgICAqIGJp bmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG06CisgICAgICAgIChHZXRHUmV0 dXJuTWFjcm8pOiBQYXNzIGZ1bmN0aW9uTmFtZSwgYXMgaW4gc29tZSBjYXNlcyB0aGUgY29kZQor ICAgICAgICBnZW5lcmF0ZWQgZGVwZW5kcyBvbiB0aGUgcGFyYW1OYW1lIGFuZCB0aGUgZnVuY3Rp b25OYW1lCisgICAgICAgIChQYXJhbUNhbkJlTnVsbCk6IENoZWNrcyBpZiBhIHBhcmFtZXRlciBp cyBhbGxvd2VkIHRvIGJlIE5VTEwgCisgICAgICAgIChHZW5lcmF0ZUZ1bmN0aW9uKToKKwogMjAx My0wNi0wNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZl cnQgdGhlIHNlY29uZCBoYWxmIG9mIHIxNTEyNTcuIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y3Jl YXRlIGNhbiByZXR1cm4gbnVsbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCBmNzNmNGE2ZDVjNjM5YTM0 MTE0ZmU0NmJlMTRmYzFmZDFmOThhYzEyLi44MjBiOWQxZWVkMTI1Mjc1OTAwZTIwOGE1ZjYyOTNk NDIzZjAwNWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMDYtMDYg IERpZWdvIFBpbm8gR2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBQ YXJhbWV0ZXJzICdpblJlc3VsdCcgYW5kICdyZXNvbHZlcicgZnJvbSBmdW5jdGlvbiAnd2Via2l0 X2RvbV9kb2N1bWVudF9ldmFsdWF0ZScgc2hvdWxkIGJlIGFsbG93ZWQgdG8gYmUgTlVMTAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MTI5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgZm9y IGZ1bmN0aW9uICd3ZWJraXRfZG9tX2RvY3VtZW50X2V2YWx1YXRlJy4KKworICAgICAgICAqIHRl c3RzL3Rlc3Rkb21kb2N1bWVudC5jOgorICAgICAgICAodGVzdF9kb21fZG9jdW1lbnRfZXZhbHVh dGUpOiBDaGVja3MgZnVuY3Rpb24gZG9tX2RvY3VtZW50X2V2YWx1YXRlLAorICAgICAgICBleGVj dXRlcyBhbiBYUGF0aCBleHByZXNzaW9uIG9uIGEgSFRNTCBkb2N1bWVudC4KKyAgICAgICAgKG1h aW4pOiAKKwogMjAxMy0wNi0wNSAgQWxiZXJ0byBHYXJjaWEgIDxhZ2FyY2lhQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dUS10gQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6IGZpeCBsYXll ckZsdXNoVGltZXJGaXJlZENhbGxiYWNrIGNvbmRpdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbSBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0KaW5kZXggMDYy NjM5YjZiM2M0NzJlOWZiZjYyNzZhMjE4ZWI5OWYyMjJhNzhlNC4uOWY5NzdiNTEyODNiNThmYzkz MTJiYjgzMmQ2NzdjMmY4MmUwN2QxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yR09iamVjdC5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtCkBAIC00NSw2ICs0NSwxMSBA QCBteSAlYmFzZVR5cGVIYXNoID0gKCJPYmplY3QiID0+IDEsICJOb2RlIiA9PiAxLCAiTm9kZUxp c3QiID0+IDEsICJOYW1lZE5vZGVNYXAiCiAgICAgICAgICAgICAgICAgICAgICJOb2RlSXRlcmF0 b3IiID0+IDEsICJUcmVlV2Fsa2VyIiA9PiAxLCAiQWJzdHJhY3RWaWV3IiA9PiAxLCAiQmxvYiIg PT4gMSwgIkRPTVRva2VuTGlzdCIgPT4gMSwKICAgICAgICAgICAgICAgICAgICAgIkhUTUxDb2xs ZWN0aW9uIiA9PiAxKTsKIAorIyBMaXN0IG9mIGZ1bmN0aW9uIHBhcmFtZXRlcnMgdGhhdCBhcmUg YWxsb3dlZCB0byBiZSBOVUxMCitteSAkY2FuQmVOdWxsUGFyYW1zID0geworICAgICd3ZWJraXRf ZG9tX2RvY3VtZW50X2V2YWx1YXRlJyA9PiBbJ2luUmVzdWx0JywgJ3Jlc29sdmVyJ10KK307CisK ICMgRGVmYXVsdCBjb25zdHJ1Y3Rvcgogc3ViIG5ldyB7CiAgICAgbXkgJG9iamVjdCA9IHNoaWZ0 OwpAQCAtODQ1LDcgKzg1MCw3IEBAIEVPRgogfQogCiBzdWIgR2V0R1JldHVybk1hY3JvIHsKLSAg ICBteSAoJHBhcmFtTmFtZSwgJHBhcmFtSURMVHlwZSwgJHJldHVyblR5cGUpID0gQF87CisgICAg bXkgKCRwYXJhbU5hbWUsICRwYXJhbUlETFR5cGUsICRyZXR1cm5UeXBlLCAkZnVuY3Rpb25OYW1l KSA9IEBfOwogCiAgICAgbXkgJGNvbmRpdGlvbjsKICAgICBpZiAoJHBhcmFtSURMVHlwZSBlcSAi R0Vycm9yIikgewpAQCAtODUzLDYgKzg1OCw5IEBAIHN1YiBHZXRHUmV0dXJuTWFjcm8gewogICAg IH0gZWxzaWYgKElzR0RPTUNsYXNzVHlwZSgkcGFyYW1JRExUeXBlKSkgewogICAgICAgICBteSAk cGFyYW1UeXBlQ2FwcyA9IHVjKEZpeFVwRGVjYW1lbGl6ZWROYW1lKGRlY2FtZWxpemUoJHBhcmFt SURMVHlwZSkpKTsKICAgICAgICAgJGNvbmRpdGlvbiA9ICJXRUJLSVRfRE9NX0lTXyR7cGFyYW1U eXBlQ2Fwc30oJHBhcmFtTmFtZSkiOworICAgICAgICBpZiAoUGFyYW1DYW5CZU51bGwoJGZ1bmN0 aW9uTmFtZSwgJHBhcmFtTmFtZSkpIHsKKyAgICAgICAgICAgICRjb25kaXRpb24gPSAiISRwYXJh bU5hbWUgfHwgJGNvbmRpdGlvbiI7CisgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICAk Y29uZGl0aW9uID0gIiRwYXJhbU5hbWUiOwogICAgIH0KQEAgLTg2OCw2ICs4NzYsMTUgQEAgc3Vi IEdldEdSZXR1cm5NYWNybyB7CiAgICAgcmV0dXJuICRtYWNybzsKIH0KIAorc3ViIFBhcmFtQ2Fu QmVOdWxsIHsKKyAgICBteSgkZnVuY3Rpb25OYW1lLCAkcGFyYW1OYW1lKSA9IEBfOworCisgICAg aWYgKGRlZmluZWQoJGZ1bmN0aW9uTmFtZSkpIHsKKyAgICAgICAgcmV0dXJuIHNjYWxhcihncmVw KC8kcGFyYW1OYW1lLywgQHskY2FuQmVOdWxsUGFyYW1zLT57JGZ1bmN0aW9uTmFtZX19KSk7Cisg ICAgfQorICAgIHJldHVybiAwOworfQorCiBzdWIgR2VuZXJhdGVGdW5jdGlvbiB7CiAgICAgbXkg KCRvYmplY3QsICRpbnRlcmZhY2VOYW1lLCAkZnVuY3Rpb24sICRwcmVmaXgsICRwYXJlbnROb2Rl KSA9IEBfOwogCkBAIC05NzMsMTIgKzk5MCw4IEBAIHN1YiBHZW5lcmF0ZUZ1bmN0aW9uIHsKICAg ICAgICAgbXkgJHBhcmFtVHlwZUlzUHJpbWl0aXZlID0gJGNvZGVHZW5lcmF0b3ItPklzUHJpbWl0 aXZlVHlwZSgkcGFyYW1JRExUeXBlKTsKICAgICAgICAgbXkgJHBhcmFtSXNHRE9NVHlwZSA9IElz R0RPTUNsYXNzVHlwZSgkcGFyYW1JRExUeXBlKTsKICAgICAgICAgaWYgKCEkcGFyYW1UeXBlSXNQ cmltaXRpdmUpIHsKLSAgICAgICAgICAgICMgRklYTUU6IFRlbXBvcmFyeSBoYWNrIGZvciBnZW5l cmF0aW5nIGEgcHJvcGVyIGltcGxlbWVudGF0aW9uCi0gICAgICAgICAgICAjICAgICAgICBvZiB0 aGUgd2Via2l0X2RvbV9kb2N1bWVudF9ldmFsdWF0ZSBmdW5jdGlvbiAoQnVnLUlEOiA0MjExNSkK LSAgICAgICAgICAgIGlmICghKCgkZnVuY3Rpb25OYW1lIGVxICJ3ZWJraXRfZG9tX2RvY3VtZW50 X2V2YWx1YXRlIikgJiYgKCRwYXJhbUlETFR5cGUgZXEgIlhQYXRoUmVzdWx0IikpKSB7Ci0gICAg ICAgICAgICAgICAgJGdSZXR1cm5NYWNybyA9IEdldEdSZXR1cm5NYWNybygkcGFyYW1OYW1lLCAk cGFyYW1JRExUeXBlLCAkcmV0dXJuVHlwZSk7Ci0gICAgICAgICAgICAgICAgcHVzaChAY0JvZHks ICRnUmV0dXJuTWFjcm8pOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgJGdSZXR1cm5NYWNy byA9IEdldEdSZXR1cm5NYWNybygkcGFyYW1OYW1lLCAkcGFyYW1JRExUeXBlLCAkcmV0dXJuVHlw ZSwgJGZ1bmN0aW9uTmFtZSk7CisgICAgICAgICAgICBwdXNoKEBjQm9keSwgJGdSZXR1cm5NYWNy byk7CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3Rl c3RzL3Rlc3Rkb21kb2N1bWVudC5jIGIvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGRvbWRv Y3VtZW50LmMKaW5kZXggZTQwYTg5NWJjODY4ODU2YzNmOTgwMDNhMTJiNzA3NGMyMDIwNmU2YS4u NTczMTU5MzE2OTc2MDVlNjcxY2FjYmU2Y2NhY2U4ZGYwZWUwNTA2OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGRvbWRvY3VtZW50LmMKKysrIGIvU291cmNlL1dlYktp dC9ndGsvdGVzdHMvdGVzdGRvbWRvY3VtZW50LmMKQEAgLTMyLDYgKzMyLDcgQEAKICNkZWZpbmUg SFRNTF9ET0NVTUVOVF9MSU5LUyAiPGh0bWw+PGhlYWQ+PHRpdGxlPlRpdGxlPC90aXRsZT48L2hl YWQ+PGJvZHk+PGEgaHJlZj1cImFib3V0OmJsYW5rXCI+Ymxhbms8L2E+PGEgaHJlZj1cImh0dHA6 Ly93d3cuZ29vZ2xlLmNvbVwiPmdvb2dsZTwvYT48YSBocmVmPVwiaHR0cDovL3d3dy53ZWJraXQu b3JnXCI+d2Via2l0PC9hPjwvYm9keT48L2h0bWw+IgogI2RlZmluZSBIVE1MX0RPQ1VNRU5UX0lG UkFNRSAiPGh0bWw+PGhlYWQ+PHRpdGxlPklGcmFtZTwvdGl0bGU+PC9oZWFkPjxib2R5PjxpZnJh bWUgaWQ9J2lmcmFtZSc+PC9pZnJhbWU+PGRpdiBpZD0ndGVzdCc+PC9kaXY+PC9ib2R5PjwvaHRt bD4iCiAjZGVmaW5lIEhUTUxfRE9DVU1FTlRfVEFCTEUgIjxodG1sPjxib2R5Pjx0YWJsZSBpZD1c InRhYmxlXCI+PC90YWJsZT48L2JvZHk+PC9odG1sPiIKKyNkZWZpbmUgSFRNTF9ET0NVTUVOVF9F VkFMVUFURSAiPGh0bWw+PGhlYWQ+PHRpdGxlPjwvdGl0bGU+PC9oZWFkPjxib2R5PjxkaXY+Rmly c3QgZGl2PC9kaXY+PGRpdj5TZWNvbmQgZGl2PC9kaXY+PC9ib2R5PjwvaHRtbD4iCiAKIHR5cGVk ZWYgc3RydWN0IHsKICAgICBHdGtXaWRnZXQqIHdlYlZpZXc7CkBAIC0yMDgsNiArMjA5LDM2IEBA IHN0YXRpYyB2b2lkIHRlc3RfZG9tX2RvY3VtZW50X2luc2VydF9yb3coRG9tRG9jdW1lbnRGaXh0 dXJlKiBmaXh0dXJlLCBnY29uc3Rwb2luCiAgICAgZ19hc3NlcnRfY21waW50KHdlYmtpdF9kb21f aHRtbF9jb2xsZWN0aW9uX2dldF9sZW5ndGgocm93cyksID09LCAxKTsKIH0KIAorc3RhdGljIHZv aWQgdGVzdF9kb21fZG9jdW1lbnRfZXZhbHVhdGUoRG9tRG9jdW1lbnRGaXh0dXJlKiBmaXh0dXJl LCBnY29uc3Rwb2ludGVyIGRhdGEpCit7CisgICAgZ19hc3NlcnQoZml4dHVyZSk7CisgICAgV2Vi S2l0V2ViVmlldyogdmlldyA9IChXZWJLaXRXZWJWaWV3KilmaXh0dXJlLT53ZWJWaWV3OworICAg IGdfYXNzZXJ0KHZpZXcpOworICAgIFdlYktpdERPTURvY3VtZW50KiBkb2N1bWVudCA9IHdlYmtp dF93ZWJfdmlld19nZXRfZG9tX2RvY3VtZW50KHZpZXcpOworICAgIGdfYXNzZXJ0KFdFQktJVF9E T01fSVNfRE9DVU1FTlQoZG9jdW1lbnQpKTsKKyAgICBXZWJLaXRET01Ob2RlTGlzdCogbGlzdCA9 IHdlYmtpdF9kb21fZG9jdW1lbnRfZ2V0X2VsZW1lbnRzX2J5X3RhZ19uYW1lKGRvY3VtZW50LCAi aHRtbCIpOworICAgIGdfYXNzZXJ0KGxpc3QpOworICAgIGd1bG9uZyBsZW5ndGggPSB3ZWJraXRf ZG9tX25vZGVfbGlzdF9nZXRfbGVuZ3RoKGxpc3QpOworICAgIGdfYXNzZXJ0X2NtcGludChsZW5n dGgsID09LCAxKTsKKyAgICBXZWJLaXRET01Ob2RlKiBodG1sID0gd2Via2l0X2RvbV9ub2RlX2xp c3RfaXRlbShsaXN0LCAwKTsKKyAgICBnX2Fzc2VydChXRUJLSVRfRE9NX0lTX05PREUoaHRtbCkp OworCisgICAgV2ViS2l0RE9NWFBhdGhSZXN1bHQqIHJlc3VsdCA9IHdlYmtpdF9kb21fZG9jdW1l bnRfZXZhbHVhdGUoZG9jdW1lbnQsICIvL2RpdiIsIGh0bWwsIE5VTEwsIDAsIE5VTEwsIE5VTEwp OworICAgIGdfYXNzZXJ0KFdFQktJVF9ET01fSVNfWFBBVEhfUkVTVUxUKHJlc3VsdCkpOworCisg ICAgaW50IGkgPSAwOworICAgIFdlYktpdERPTU5vZGUqIG5vZGU7CisgICAgd2hpbGUgKCAobm9k ZSA9IHdlYmtpdF9kb21feHBhdGhfcmVzdWx0X2l0ZXJhdGVfbmV4dChyZXN1bHQsIE5VTEwpKSAh PSBOVUxMKSB7CisgICAgICAgIGdfYXNzZXJ0KG5vZGUpOworICAgICAgICBXZWJLaXRET01FbGVt ZW50KiBlbGVtZW50ID0gKFdlYktpdERPTUVsZW1lbnQqKW5vZGU7CisgICAgICAgIGdfYXNzZXJ0 X2NtcHN0cih3ZWJraXRfZG9tX2VsZW1lbnRfZ2V0X3RhZ19uYW1lKGVsZW1lbnQpLCA9PSwgIkRJ ViIpOworICAgICAgICBpKys7CisgICAgfQorICAgIGdfYXNzZXJ0X2NtcGludChpLCA9PSwgMik7 CisKKyAgICBnX29iamVjdF91bnJlZihsaXN0KTsKK30KKwogc3RhdGljIHZvaWQgd2Vha19ub3Rp ZnkoZ3BvaW50ZXIgZGF0YSwgR09iamVjdCogem9tYmllKQogewogICAgIGd1aW50KiBjb3VudCA9 IChndWludCopZGF0YTsKQEAgLTM4MCw2ICs0MTEsMTIgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNo YXIqKiBhcmd2KQogICAgICAgICAgICAgICAgdGVzdF9kb21fZG9jdW1lbnRfaW5zZXJ0X3JvdywK ICAgICAgICAgICAgICAgIGRvbV9kb2N1bWVudF9maXh0dXJlX3RlYXJkb3duKTsKIAorICAgIGdf dGVzdF9hZGQoIi93ZWJraXQvZG9tZG9jdW1lbnQvdGVzdF9kb2N1bWVudF9ldmFsdWF0ZSIsCisg ICAgICAgICAgICAgICBEb21Eb2N1bWVudEZpeHR1cmUsIEhUTUxfRE9DVU1FTlRfRVZBTFVBVEUs CisgICAgICAgICAgICAgICBkb21fZG9jdW1lbnRfZml4dHVyZV9zZXR1cCwKKyAgICAgICAgICAg ICAgIHRlc3RfZG9tX2RvY3VtZW50X2V2YWx1YXRlLAorICAgICAgICAgICAgICAgZG9tX2RvY3Vt ZW50X2ZpeHR1cmVfdGVhcmRvd24pOworCiAgICAgZ190ZXN0X2FkZCgiL3dlYmtpdC9kb21kb2N1 bWVudC90ZXN0X2dhcmJhZ2VfY29sbGVjdGlvbiIsCiAgICAgICAgICAgICAgICBEb21Eb2N1bWVu dEZpeHR1cmUsIEhUTUxfRE9DVU1FTlRfTElOS1MsCiAgICAgICAgICAgICAgICBkb21fZG9jdW1l bnRfZml4dHVyZV9zZXR1cCwK