85036 2012-04-27 01:50:45 -0700 [BlackBerry] Rendering bmp file as text file when Content-Type:image/x-ms-bmp from apache web server. 2012-05-04 14:13:42 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 jasonliuwebkit rwlbuis rwlbuis staikos tonikitoo webkit.review.bot oldest_to_newest 611313 0 jasonliuwebkit 2012-04-27 01:50:45 -0700 1. Go to http://browser.swlab.rim.net/test/rendering/html/EnclosureElements/bmp.bmp Expected: See the picture Actual: BM6g6........................(garbage text display) 612070 1 139315 jasonliuwebkit 2012-04-27 18:48:29 -0700 Created attachment 139315 Patch 616420 2 139315 rwlbuis 2012-05-04 10:54:11 -0700 Comment on attachment 139315 Patch I know of a more generic fix that also removed the pjpeg hack, that one did not seem very elegant. 616446 3 140280 rwlbuis 2012-05-04 11:17:16 -0700 Created attachment 140280 Patch 616454 4 webkit.review.bot 2012-05-04 11:21:06 -0700 Attachment 140280 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/blackberry/Api/WebSettings.cpp:24: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 616461 5 140284 rwlbuis 2012-05-04 11:32:42 -0700 Created attachment 140284 Patch 616474 6 140284 tonikitoo 2012-05-04 11:43:48 -0700 Comment on attachment 140284 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140284&action=review > Source/WebCore/platform/MIMETypeRegistry.cpp:689 > +String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType) can this be inline? > Source/WebCore/platform/MIMETypeRegistry.cpp:696 > +#if PLATFORM(BLACKBERRY) > + MIMETypeAssociationMap::const_iterator it = mimeTypeAssociationMap().find(mimeType); > + > + return it == mimeTypeAssociationMap().end() ? mimeType : it->second; > +#else > + return mimeType; 691#if PLATFORM(BLACKBERRY) 692 MIMETypeAssociationMap::const_iterator it = mimeTypeAssociationMap().find(mimeType); 693 if (it != mimeTypeAssociationMap().end()) 694 return it->second; 695#endif 696 return mimeType; 616521 7 rwlbuis 2012-05-04 12:29:01 -0700 (In reply to comment #6) > (From update of attachment 140284 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=140284&action=review > > > Source/WebCore/platform/MIMETypeRegistry.cpp:689 > > +String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType) > > can this be inline? I know what you mean, would be better for performance, but a lot of datastructure stuff would have to be moved into the header. 616524 8 140298 rwlbuis 2012-05-04 12:31:03 -0700 Created attachment 140298 Patch 616634 9 rwlbuis 2012-05-04 14:13:42 -0700 Landed in r116145. 139315 2012-04-27 18:48:29 -0700 2012-05-04 11:17:08 -0700 Patch bug-85036-20120428094826.patch text/plain 1600 jasonliuwebkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NDEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWEzZTkxZDMwZDYwNTFm ZmQ4MGQzNDRhYTVkMGExNDcxYzJkZWIyMi4uMDM4ZDYyNGViZjM0YjBlZTQ4NjQyNzNlZDc2ZDVi MmEzNzZkMmEzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA0LTI3ICBKYXNv biBMaXUgIDxqYXNvbi5saXVAdG9yY2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFja0Jl cnJ5XSBSZW5kZXJpbmcgYm1wIGZpbGUgYXMgdGV4dCBmaWxlIHdoZW4gQ29udGVudC1UeXBlOmlt YWdlL3gtbXMtYm1wIGZyb20gYXBhY2hlIHdlYiBzZXJ2ZXIuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTAzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgQmxhY2tCZXJyeSBzdXBwb3J0IHJlbmRl cmluZyBibXAgZmlsZXMgd2l0aCBDb250ZW50LVR5cGU6aW1hZ2UveC1tcy1ibXAuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLiBKdXN0IGVuYWJsZSBzdXBwb3J0aW5nIGZvciBDb250ZW50LVR5cGU6 aW1hZ2UveC1tcy1ibXAuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmluaXRpYWxpemVTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlcyk6 CisKIDIwMTItMDQtMjYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUkVHUkVTU0lPTiAocjk0NDk3KTogUHJlc3NpbmcgQ29tbWFuZCtBIHdoZW4gaW5saW5lIChN YXJrZWQgVGV4dCkgaXMgbm90IGVtcHR5IHdpbGwgY2xlYW4gd2hvbGUgY29udGVudApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAppbmRleCBiNDgzMGNkNTU5 MTEyN2JlZDgxZDQzYjdmNDRmMjcwNTgxZjU1ZWZmLi5hYTMyYjA4NTVhNmJmZTJjZTEzODAwM2Zk NWI0MDYxZTdkNjczNWU5IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1F VHlwZVJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJl Z2lzdHJ5LmNwcApAQCAtMjYyLDYgKzI2Miw4IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVTdXBw b3J0ZWRJbWFnZU1JTUVUeXBlcygpCiAjaWYgUExBVEZPUk0oQkxBQ0tCRVJSWSkKICAgICBzdXBw b3J0ZWRJbWFnZU1JTUVUeXBlcy0+YWRkKCJpbWFnZS9wanBlZyIpOwogICAgIHN1cHBvcnRlZElt YWdlUmVzb3VyY2VNSU1FVHlwZXMtPmFkZCgiaW1hZ2UvcGpwZWciKTsKKyAgICBzdXBwb3J0ZWRJ bWFnZU1JTUVUeXBlcy0+YWRkKCJpbWFnZS94LW1zLWJtcCIpOworICAgIHN1cHBvcnRlZEltYWdl UmVzb3VyY2VNSU1FVHlwZXMtPmFkZCgiaW1hZ2UveC1tcy1ibXAiKTsKICNlbmRpZgogI2VuZGlm CiB9Cg== 140280 2012-05-04 11:17:16 -0700 2012-05-04 11:32:38 -0700 Patch bug-85036-20120504141738.patch text/plain 14633 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE0NGI3MTk2OTJhMjEw Nzc5ZWE4YzgzYTA4YmRmMzdjOTQzMjMxNC4uN2Y2NjBlMzdjMTUyM2EzNjBiYjUxNTMwMDhhNWRh ZjU1NjJkNWRkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA1LTA0ICBSb2Ig QnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJlbmRlcmluZyBi bXAgZmlsZSBhcyB0ZXh0IGZpbGUgd2hlbiBDb250ZW50LVR5cGU6aW1hZ2UveC1tcy1ibXAgZnJv bSBhcGFjaGUgd2ViIHNlcnZlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg1MDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTW92ZSBnZXROb3JtYWxpemVkTUlNRVR5cGUgZnJvbSBXZWJLaXQgaW50byBN SU1FVHlwZVJlZ2lzdHJ5LiBUaGlzIHdheSB3ZSBzdXBwb3J0IHVuY29tbW9uIG1pbWUgdHlwZXMg bGlrZSBpbWFnZS9wanBlZworICAgICAgICBhbmQgaW1hZ2UveC1tcy1ibXAgb3V0IG9mIHRoZSBi b3ggc2luY2Ugd2UgbWFwIHRvIHRoZSBtb3JlIGNvbW1vbiBpbWFnZS9qcGVnIGFuZCBpbWFnZS9i bXAgcmVzcGVjdGl2ZWx5LgorCisgICAgICAgICogcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjppbml0aWFsaXplU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMp OgorICAgICAgICAoV2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1J TUVUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVk SW1hZ2VSZXNvdXJjZU1JTUVUeXBlKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2Vi Q29yZTo6bWltZVR5cGVBc3NvY2lhdGlvbk1hcCk6CisgICAgICAgIChXZWJDb3JlOjpNSU1FVHlw ZVJlZ2lzdHJ5OjpnZXROb3JtYWxpemVkTUlNRVR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL01J TUVUeXBlUmVnaXN0cnkuaDoKKyAgICAgICAgKE1JTUVUeXBlUmVnaXN0cnkpOgorCiAyMDEyLTA1 LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IEVYQ19CQURfQUNDRVNTIGluIERPTSBicmVha3BvaW50IHByb2Nlc3Npbmcg Y29kZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDQxM2YxMWVkMTk1MjY2MzJi OTAzMDBiNTQzYWRiZDA4NTczODFjYTIuLjcxN2Y2Y2FiMzU0NTE0MjI0MTA3NzdlZjAzODkwMjZi OGE4NTBiZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBA CisyMDEyLTA1LTA0ICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNr QmVycnldIFJlbmRlcmluZyBibXAgZmlsZSBhcyB0ZXh0IGZpbGUgd2hlbiBDb250ZW50LVR5cGU6 aW1hZ2UveC1tcy1ibXAgZnJvbSBhcGFjaGUgd2ViIHNlcnZlci4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1MDM2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSBnZXROb3JtYWxpemVkTUlNRVR5cGUg aW50byBXZWJDb3JlOjpNSU1FVHlwZVJlZ2lzdHJ5LgorCisgICAgICAgICogQXBpL1dlYlNldHRp bmdzLmNwcDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OldlYlNldHRpbmdzOjppc1N1cHBvcnRlZE9iamVjdE1JTUVUeXBlKToKKyAgICAgICAgKiBBcGkv V2ViU2V0dGluZ3MuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFj a0JlcnJ5OjpjcmVhdGVQbHVnaW4pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5OjpjYW5TaG93TUlNRVR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXJDbGllbnRCbGFja0JlcnJ5OjpvYmplY3RDb250ZW50VHlwZSk6CisKIDIwMTItMDQtMTgg IEpvbiBIb25leWN1dHQgIDxqaG9uZXljdXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBGcmFtZUxv YWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsU2VuZFN1Ym1pdEV2ZW50KCkgc2hvdWxkIGJlIGdpdmVu IG1vcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0 cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKaW5k ZXggYjQ4MzBjZDU1OTExMjdiZWQ4MWQ0M2I3ZjQ0ZjI3MDU4MWY1NWVmZi4uZjNhOWNjZDE4NzI3 ZTNhZDVlZjYxZmQ5OWIwODNmMzc3MjQwMDA4NSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKQEAgLTI1OSwxMCArMjU5LDYgQEAgc3RhdGljIHZvaWQg aW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRVR5cGVzKCkKICAgICAgICAgc3VwcG9ydGVkSW1h Z2VNSU1FVHlwZXMtPmFkZCh0eXBlc1tpXSk7CiAgICAgICAgIHN1cHBvcnRlZEltYWdlUmVzb3Vy Y2VNSU1FVHlwZXMtPmFkZCh0eXBlc1tpXSk7CiAgICAgfQotI2lmIFBMQVRGT1JNKEJMQUNLQkVS UlkpCi0gICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMtPmFkZCgiaW1hZ2UvcGpwZWciKTsKLSAg ICBzdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGVzLT5hZGQoImltYWdlL3BqcGVnIik7Ci0j ZW5kaWYKICNlbmRpZgogfQogCkBAIC01MTMsNyArNTA5LDcgQEAgYm9vbCBNSU1FVHlwZVJlZ2lz dHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMpCiAg ICAgICAgIGluaXRpYWxpemVNSU1FVHlwZVJlZ2lzdHJ5KCk7Ci0gICAgcmV0dXJuIHN1cHBvcnRl ZEltYWdlTUlNRVR5cGVzLT5jb250YWlucyhtaW1lVHlwZSk7CisgICAgcmV0dXJuIHN1cHBvcnRl ZEltYWdlTUlNRVR5cGVzLT5jb250YWlucyhnZXROb3JtYWxpemVkTUlNRVR5cGUobWltZVR5cGUp KTsKIH0KIAogYm9vbCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlUmVzb3VyY2VN SU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQpAQCAtNTIyLDcgKzUxOCw3IEBAIGJvb2wg TUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGUoY29uc3Qg U3RyaW5nJiBtaW1lVHlwZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghc3VwcG9y dGVkSW1hZ2VSZXNvdXJjZU1JTUVUeXBlcykKICAgICAgICAgaW5pdGlhbGl6ZU1JTUVUeXBlUmVn aXN0cnkoKTsKLSAgICByZXR1cm4gc3VwcG9ydGVkSW1hZ2VSZXNvdXJjZU1JTUVUeXBlcy0+Y29u dGFpbnMobWltZVR5cGUpOworICAgIHJldHVybiBzdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5 cGVzLT5jb250YWlucyhnZXROb3JtYWxpemVkTUlNRVR5cGUobWltZVR5cGUpKTsKIH0KIAogYm9v bCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGVGb3JFbmNvZGluZyhj b25zdCBTdHJpbmcmIG1pbWVUeXBlKQpAQCAtNjMxLDQgKzYyNyw3NSBAQCBjb25zdCBTdHJpbmcm IGRlZmF1bHRNSU1FVHlwZSgpCiAgICAgcmV0dXJuIGRlZmF1bHRNSU1FVHlwZTsKIH0KIAorI2lm IFBMQVRGT1JNKEJMQUNLQkVSUlkpCit0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+IE1J TUVUeXBlQXNzb2NpYXRpb25NYXA7CisKK3N0YXRpYyBjb25zdCBNSU1FVHlwZUFzc29jaWF0aW9u TWFwJiBtaW1lVHlwZUFzc29jaWF0aW9uTWFwKCkKK3sKKyAgICBzdGF0aWMgTUlNRVR5cGVBc3Nv Y2lhdGlvbk1hcCogbWltZVR5cGVNYXAgPSAwOworICAgIGlmIChtaW1lVHlwZU1hcCkKKyAgICAg ICAgcmV0dXJuICptaW1lVHlwZU1hcDsKKworICAgIG1pbWVUeXBlTWFwID0gbmV3IE1JTUVUeXBl QXNzb2NpYXRpb25NYXA7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1tcy1ibXAiLCAi aW1hZ2UvYm1wIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC13aW5kb3dzLWJtcCIs ICJpbWFnZS9ibXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LWJtcCIsICJpbWFn ZS9ibXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LWJpdG1hcCIsICJpbWFnZS9i bXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LW1zLWJpdG1hcCIsICJpbWFnZS9i bXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS9qcGciLCAiaW1hZ2UvanBlZyIpOwor ICAgIG1pbWVUeXBlTWFwLT5hZGQoImltYWdlL3BqcGVnIiwgImltYWdlL2pwZWciKTsKKyAgICBt aW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LXBuZyIsICJpbWFnZS9wbmciKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJpbWFnZS92bmQucmltLnBuZyIsICJpbWFnZS9wbmciKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJpbWFnZS9pY28iLCAiaW1hZ2Uvdm5kLm1pY3Jvc29mdC5pY29uIik7CisgICAg bWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UvaWNvbiIsICJpbWFnZS92bmQubWljcm9zb2Z0Lmljb24i KTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJ0ZXh0L2ljbyIsICJpbWFnZS92bmQubWljcm9zb2Z0 Lmljb24iKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhcHBsaWNhdGlvbi9pY28iLCAiaW1hZ2Uv dm5kLm1pY3Jvc29mdC5pY29uIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1pY29u IiwgImltYWdlL3ZuZC5taWNyb3NvZnQuaWNvbiIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1 ZGlvL3ZuZC5xY2VscCIsICJhdWRpby9xY2VscCIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1 ZGlvL3FjcCIsICJhdWRpby9xY2VscCIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3Zu ZC5xY3AiLCAiYXVkaW8vcWNlbHAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby93YXYi LCAiYXVkaW8veC13YXYiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby9taWQiLCAiYXVk aW8vbWlkaSIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3NwLW1pZGkiLCAiYXVkaW8v bWlkaSIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3gtbWlkIiwgImF1ZGlvL21pZGki KTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1pZGkiLCAiYXVkaW8vbWlkaSIpOwor ICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3gtbXBlZyIsICJhdWRpby9tcGVnIik7CisgICAg bWltZVR5cGVNYXAtPmFkZCgiYXVkaW8vbXAzIiwgImF1ZGlvL21wZWciKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJhdWRpby94LW1wMyIsICJhdWRpby9tcGVnIik7CisgICAgbWltZVR5cGVNYXAt PmFkZCgiYXVkaW8vbXBlZzMiLCAiYXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQo ImF1ZGlvL3gtbXBlZzMiLCAiYXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1 ZGlvL21wZzMiLCAiYXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL21w ZyIsICJhdWRpby9tcGVnIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1tcGciLCAi YXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL200YSIsICJhdWRpby9t cDQiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW00YSIsICJhdWRpby9tcDQiKTsK KyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1wNCIsICJhdWRpby9tcDQiKTsKKyAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LWFhYyIsICJhdWRpby9hYWMiKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJhdWRpby94LWFtciIsICJhdWRpby9hbXIiKTsKKyAgICBtaW1lVHlwZU1hcC0+ YWRkKCJhdWRpby9tcGVndXJsIiwgImF1ZGlvL3gtbXBlZ3VybCIpOworICAgIG1pbWVUeXBlTWFw LT5hZGQoImF1ZGlvL2ZsYWMiLCAiYXVkaW8veC1mbGFjIik7CisgICAgbWltZVR5cGVNYXAtPmFk ZCgidmlkZW8vM2dwIiwgInZpZGVvLzNncHAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJ2aWRl by9hdmkiLCAidmlkZW8veC1tc3ZpZGVvIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgidmlkZW8v eC1tNHYiLCAidmlkZW8vbXA0Iik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgidmlkZW8veC1xdWlj a3RpbWUiLCAidmlkZW8vcXVpY2t0aW1lIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiYXBwbGlj YXRpb24vamF2YSIsICJhcHBsaWNhdGlvbi9qYXZhLWFyY2hpdmUiKTsKKyAgICBtaW1lVHlwZU1h cC0+YWRkKCJhcHBsaWNhdGlvbi94LWphdmEtYXJjaGl2ZSIsICJhcHBsaWNhdGlvbi9qYXZhLWFy Y2hpdmUiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhcHBsaWNhdGlvbi94LXppcC1jb21wcmVz c2VkIiwgImFwcGxpY2F0aW9uL3ppcCIpOworCisgICAgcmV0dXJuICptaW1lVHlwZU1hcDsKK30K KyNlbmRpZgorCitTdHJpbmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBl KGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCit7CisjaWYgUExBVEZPUk0oQkxBQ0tCRVJSWSkKKyAg ICBNSU1FVHlwZUFzc29jaWF0aW9uTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1pbWVUeXBlQXNz b2NpYXRpb25NYXAoKS5maW5kKG1pbWVUeXBlKTsKKworICAgIHJldHVybiBpdCA9PSBtaW1lVHlw ZUFzc29jaWF0aW9uTWFwKCkuZW5kKCkgPyBtaW1lVHlwZSA6IGl0LT5zZWNvbmQ7CisjZWxzZQor ICAgIHJldHVybiBtaW1lVHlwZTsKKyNlbmRpZgorfQorCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnku aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuaAppbmRleCA3ZmE2 ZGI2ZDdjNDU5ZWRhNzZmNDk0Y2Q0NTRjN2I2MzMwNjE3MDA4Li5iY2ZlZGNhMTQ4NTI0OGFmNjFj YTBjOGQ5OThkNWVhNDA0NzQxNTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9NSU1FVHlwZVJlZ2lzdHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5 cGVSZWdpc3RyeS5oCkBAIC04NCw2ICs4NCw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgSGFzaFNl dDxTdHJpbmc+JiBnZXRTdXBwb3J0ZWROb25JbWFnZU1JTUVUeXBlcygpOwogICAgIHN0YXRpYyBI YXNoU2V0PFN0cmluZz4mIGdldFN1cHBvcnRlZE1lZGlhTUlNRVR5cGVzKCk7CiAgICAgc3RhdGlj IEhhc2hTZXQ8U3RyaW5nPiYgZ2V0VW5zdXBwb3J0ZWRUZXh0TUlNRVR5cGVzKCk7CisKKyAgICBz dGF0aWMgU3RyaW5nIGdldE5vcm1hbGl6ZWRNSU1FVHlwZShjb25zdCBTdHJpbmcmKTsKIH07CiAK IGNvbnN0IFN0cmluZyYgZGVmYXVsdE1JTUVUeXBlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCmluZGV4IGMwZTI4ODEzMThmNDdmZjc0ZGZiMDAzYzU3 ZGRiNGIwZjU4OGI5N2IuLjU3MzA1ZGM1NTllYTRjNGIxOWUxYWY2ZTE1YTE2ODg3ZDQwMDA0ZDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCkBAIC0y MSw2ICsyMSw3IEBACiAKICNpbmNsdWRlICJXZWJTZXR0aW5nc19wLmgiCiAKKyNpbmNsdWRlICJN SU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiV2ViU3RyaW5nLmgiCiAjaW5jbHVkZSA8QmFz ZTY0Lmg+CiAjaW5jbHVkZSA8Q29sb3IuaD4KQEAgLTg0LDY1ICs4NSw2IEBAIERFRklORV9TVEFU SUNfTE9DQUwoU3RyaW5nLCBXZWJLaXRVc2VyU3R5bGVTaGVldExvY2F0aW9uLCAoIldlYktpdFVz ZXJTdHlsZVNoZWV0CiBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgV2ViS2l0V2ViU29ja2V0 c0VuYWJsZWQsICgiV2ViS2l0V2ViU29ja2V0c0VuYWJsZWQiKSk7CiBERUZJTkVfU1RBVElDX0xP Q0FMKFN0cmluZywgV2ViS2l0WFNTQXVkaXRvckVuYWJsZWQsICgiV2ViS2l0WFNTQXVkaXRvckVu YWJsZWQiKSk7CiAKLS8vIEZJWE1FOiBXZSBzaG91bGQgY29uc2lkZXIgbW92aW5nIGFsbCB0aGUg bWltZSB0eXBlIGNvZGUgaW50byBpdHMgb3duIG9iamVjdC4KLQotdHlwZWRlZiBIYXNoTWFwPFN0 cmluZywgV2ViU3RyaW5nPiBNSU1FVHlwZUFzc29jaWF0aW9uTWFwOwotCi1zdGF0aWMgY29uc3Qg TUlNRVR5cGVBc3NvY2lhdGlvbk1hcCYgbWltZVR5cGVBc3NvY2lhdGlvbk1hcCgpCi17Ci0gICAg c3RhdGljIE1JTUVUeXBlQXNzb2NpYXRpb25NYXAqIG1pbWVUeXBlTWFwID0gMDsKLSAgICBpZiAo bWltZVR5cGVNYXApCi0gICAgICAgIHJldHVybiAqbWltZVR5cGVNYXA7Ci0KLSAgICBtaW1lVHlw ZU1hcCA9IG5ldyBNSU1FVHlwZUFzc29jaWF0aW9uTWFwOwotICAgIG1pbWVUeXBlTWFwLT5hZGQo ImltYWdlL3gtbXMtYm1wIiwgImltYWdlL2JtcCIpOwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImlt YWdlL3gtd2luZG93cy1ibXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgi aW1hZ2UveC1ibXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2Uv eC1iaXRtYXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1t cy1iaXRtYXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UvanBn IiwgImltYWdlL2pwZWciKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS9wanBlZyIsICJp bWFnZS9qcGVnIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1wbmciLCAiaW1hZ2Uv cG5nIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2Uvdm5kLnJpbS5wbmciLCAiaW1hZ2Uv cG5nIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UvaWNvIiwgImltYWdlL3ZuZC5taWNy b3NvZnQuaWNvbiIpOwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImltYWdlL2ljb24iLCAiaW1hZ2Uv dm5kLm1pY3Jvc29mdC5pY29uIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgidGV4dC9pY28iLCAi aW1hZ2Uvdm5kLm1pY3Jvc29mdC5pY29uIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXBwbGlj YXRpb24vaWNvIiwgImltYWdlL3ZuZC5taWNyb3NvZnQuaWNvbiIpOwotICAgIG1pbWVUeXBlTWFw LT5hZGQoImltYWdlL3gtaWNvbiIsICJpbWFnZS92bmQubWljcm9zb2Z0Lmljb24iKTsKLSAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby92bmQucWNlbHAiLCAiYXVkaW8vcWNlbHAiKTsKLSAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby9xY3AiLCAiYXVkaW8vcWNlbHAiKTsKLSAgICBtaW1lVHlw ZU1hcC0+YWRkKCJhdWRpby92bmQucWNwIiwgImF1ZGlvL3FjZWxwIik7Ci0gICAgbWltZVR5cGVN YXAtPmFkZCgiYXVkaW8vd2F2IiwgImF1ZGlvL3gtd2F2Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFk ZCgiYXVkaW8vbWlkIiwgImF1ZGlvL21pZGkiKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRp by9zcC1taWRpIiwgImF1ZGlvL21pZGkiKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94 LW1pZCIsICJhdWRpby9taWRpIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1taWRp IiwgImF1ZGlvL21pZGkiKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1wZWciLCAi YXVkaW8vbXBlZyIpOwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL21wMyIsICJhdWRpby9t cGVnIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1tcDMiLCAiYXVkaW8vbXBlZyIp OwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL21wZWczIiwgImF1ZGlvL21wZWciKTsKLSAg ICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1wZWczIiwgImF1ZGlvL21wZWciKTsKLSAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby9tcGczIiwgImF1ZGlvL21wZWciKTsKLSAgICBtaW1lVHlw ZU1hcC0+YWRkKCJhdWRpby9tcGciLCAiYXVkaW8vbXBlZyIpOwotICAgIG1pbWVUeXBlTWFwLT5h ZGQoImF1ZGlvL3gtbXBnIiwgImF1ZGlvL21wZWciKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJh dWRpby9tNGEiLCAiYXVkaW8vbXA0Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1t NGEiLCAiYXVkaW8vbXA0Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1tcDQiLCAi YXVkaW8vbXA0Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1hYWMiLCAiYXVkaW8v YWFjIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1hbXIiLCAiYXVkaW8vYW1yIik7 Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8vbXBlZ3VybCIsICJhdWRpby94LW1wZWd1cmwi KTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby9mbGFjIiwgImF1ZGlvL3gtZmxhYyIpOwot ICAgIG1pbWVUeXBlTWFwLT5hZGQoInZpZGVvLzNncCIsICJ2aWRlby8zZ3BwIik7Ci0gICAgbWlt ZVR5cGVNYXAtPmFkZCgidmlkZW8vYXZpIiwgInZpZGVvL3gtbXN2aWRlbyIpOwotICAgIG1pbWVU eXBlTWFwLT5hZGQoInZpZGVvL3gtbTR2IiwgInZpZGVvL21wNCIpOwotICAgIG1pbWVUeXBlTWFw LT5hZGQoInZpZGVvL3gtcXVpY2t0aW1lIiwgInZpZGVvL3F1aWNrdGltZSIpOwotICAgIG1pbWVU eXBlTWFwLT5hZGQoImFwcGxpY2F0aW9uL2phdmEiLCAiYXBwbGljYXRpb24vamF2YS1hcmNoaXZl Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXBwbGljYXRpb24veC1qYXZhLWFyY2hpdmUiLCAi YXBwbGljYXRpb24vamF2YS1hcmNoaXZlIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXBwbGlj YXRpb24veC16aXAtY29tcHJlc3NlZCIsICJhcHBsaWNhdGlvbi96aXAiKTsKLQotICAgIHJldHVy biAqbWltZVR5cGVNYXA7Ci19Ci0KIHN0YXRpYyBIYXNoU2V0PFN0cmluZz4qIHNfc3VwcG9ydGVk T2JqZWN0TUlNRVR5cGVzOwogCiBXZWJTZXR0aW5nc1ByaXZhdGU6OldlYlNldHRpbmdzUHJpdmF0 ZSgpCkBAIC0yNTQsMTQgKzE5Niw3IEBAIGJvb2wgV2ViU2V0dGluZ3M6OmlzU3VwcG9ydGVkT2Jq ZWN0TUlNRVR5cGUoY29uc3QgV2ViU3RyaW5nJiBtaW1lVHlwZSkKICAgICBpZiAoIXNfc3VwcG9y dGVkT2JqZWN0TUlNRVR5cGVzKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4g c19zdXBwb3J0ZWRPYmplY3RNSU1FVHlwZXMtPmNvbnRhaW5zKGdldE5vcm1hbGl6ZWRNSU1FVHlw ZShtaW1lVHlwZSkpOwotfQotCi1XZWJTdHJpbmcgV2ViU2V0dGluZ3M6OmdldE5vcm1hbGl6ZWRN SU1FVHlwZShjb25zdCBXZWJTdHJpbmcmIHR5cGUpCi17Ci0gICAgTUlNRVR5cGVBc3NvY2lhdGlv bk1hcDo6Y29uc3RfaXRlcmF0b3IgaSA9IG1pbWVUeXBlQXNzb2NpYXRpb25NYXAoKS5maW5kKHR5 cGUpOwotCi0gICAgcmV0dXJuIGkgPT0gbWltZVR5cGVBc3NvY2lhdGlvbk1hcCgpLmVuZCgpID8g dHlwZSA6IGktPnNlY29uZDsKKyAgICByZXR1cm4gc19zdXBwb3J0ZWRPYmplY3RNSU1FVHlwZXMt PmNvbnRhaW5zKE1JTUVUeXBlUmVnaXN0cnk6OmdldE5vcm1hbGl6ZWRNSU1FVHlwZShtaW1lVHlw ZSkpOwogfQogCiBib29sIFdlYlNldHRpbmdzOjp4c3NBdWRpdG9yRW5hYmxlZCgpIGNvbnN0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmggYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmgKaW5kZXggNzk2NmU1Zjc3 ZjBhYjk0ODVhMmM4ZWNhODQzNzVmZjAzZWQ5ZWEwYi4uMmEyM2I1ZjkwMWYwOTMxMTdmZTk2ZTY5 Yjg4YjE2ZjA3NTNlMWRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0 dGluZ3MuaApAQCAtNTYsNyArNTYsNiBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgdm9pZCBhZGRT dXBwb3J0ZWRPYmplY3RQbHVnaW5NSU1FVHlwZShjb25zdCBjaGFyKik7CiAgICAgc3RhdGljIGJv b2wgaXNTdXBwb3J0ZWRPYmplY3RNSU1FVHlwZShjb25zdCBXZWJTdHJpbmcmKTsKLSAgICBzdGF0 aWMgV2ViU3RyaW5nIGdldE5vcm1hbGl6ZWRNSU1FVHlwZShjb25zdCBXZWJTdHJpbmcmKTsKIAog ICAgIGJvb2wgeHNzQXVkaXRvckVuYWJsZWQoKSBjb25zdDsKICAgICB2b2lkIHNldFhTU0F1ZGl0 b3JFbmFibGVkKGJvb2wpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5 LmNwcAppbmRleCBlZTgxYjdhNjBmZDBhZWZkZTRkMGViZjRmM2MzNTdlZTlkMTc0Nzk3Li5jNjYy OTM3NzM0YzgzYTE0ZjU1NTljM2MwMDQ3MGQ0YzBkNjI4NTdlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0Jl cnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcApAQCAtMzIwLDcgKzMyMCw3IEBAIFBhc3NSZWZQ dHI8V2lkZ2V0PiBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmNyZWF0ZVBsdWdpbihjb25z dCBJbnRTaXplJiBwbHVnCiAgICAgU3RyaW5nIG1pbWVUeXBlKG1pbWVUeXBlSW4pOwogICAgIGlm IChtaW1lVHlwZS5pc0VtcHR5KCkpIHsKICAgICAgICAgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lz dHJ5OjpnZXRNSU1FVHlwZUZvclBhdGgodXJsLnBhdGgoKSk7Ci0gICAgICAgIG1pbWVUeXBlID0g V2ViU2V0dGluZ3M6OmdldE5vcm1hbGl6ZWRNSU1FVHlwZShtaW1lVHlwZSk7CisgICAgICAgIG1p bWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBlKG1pbWVUeXBl KTsKICAgICAgICAgaWYgKG1pbWVUeXBlICE9ICJhcHBsaWNhdGlvbi94LXNob2Nrd2F2ZS1mbGFz aCIpCiAgICAgICAgICAgICBtaW1lVHlwZSA9IG1pbWVUeXBlSW47CiAgICAgfQpAQCAtNDU2LDcg KzQ1Niw3IEBAIGJvb2wgRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpjYW5IYW5kbGVSZXF1 ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYpIGNvbnN0CiBib29sIEZyYW1lTG9hZGVyQ2xpZW50 QmxhY2tCZXJyeTo6Y2FuU2hvd01JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGVJbikgY29u c3QKIHsKICAgICAvLyBHZXQgbm9ybWFsaXplZCB0eXBlLgotICAgIFN0cmluZyBtaW1lVHlwZSA9 IFdlYlNldHRpbmdzOjpnZXROb3JtYWxpemVkTUlNRVR5cGUobWltZVR5cGVJbik7CisgICAgU3Ry aW5nIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBlKG1p bWVUeXBlSW4pOwogCiAgICAgLy8gRklYTUU6IFNlZW1zIG5vIG90aGVyIHBvcnQgY2hlY2tzIGVt cHR5IE1JTUUgdHlwZSBpbiB0aGlzIGZ1bmN0aW9uLiBTaG91bGQgd2UgZG8gdGhhdD8KICAgICBy ZXR1cm4gTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKG1pbWVUeXBl KSB8fCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUobWltZVR5 cGUpCkBAIC03NzMsNyArNzczLDcgQEAgT2JqZWN0Q29udGVudFR5cGUgRnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5OjpvYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJMJiB1cmwKICAgICAgICAg bWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvclBhdGgodXJsLnBhdGgo KSk7CiAKICAgICAvLyBHZXQgbWFwcGVkIHR5cGUuCi0gICAgbWltZVR5cGUgPSBXZWJTZXR0aW5n czo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBlKG1pbWVUeXBlKTsKKyAgICBtaW1lVHlwZSA9IE1JTUVU eXBlUmVnaXN0cnk6OmdldE5vcm1hbGl6ZWRNSU1FVHlwZShtaW1lVHlwZSk7CiAKICAgICBPYmpl Y3RDb250ZW50VHlwZSBkZWZhdWx0VHlwZSA9IEZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29u dGVudFR5cGUodXJsLCBtaW1lVHlwZSwgc2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdlcyk7CiAg ICAgaWYgKGRlZmF1bHRUeXBlICE9IE9iamVjdENvbnRlbnROb25lKQo= 140284 2012-05-04 11:32:42 -0700 2012-05-04 12:30:47 -0700 Patch bug-85036-20120504143304.patch text/plain 14639 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE0NGI3MTk2OTJhMjEw Nzc5ZWE4YzgzYTA4YmRmMzdjOTQzMjMxNC4uN2Y2NjBlMzdjMTUyM2EzNjBiYjUxNTMwMDhhNWRh ZjU1NjJkNWRkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA1LTA0ICBSb2Ig QnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJlbmRlcmluZyBi bXAgZmlsZSBhcyB0ZXh0IGZpbGUgd2hlbiBDb250ZW50LVR5cGU6aW1hZ2UveC1tcy1ibXAgZnJv bSBhcGFjaGUgd2ViIHNlcnZlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg1MDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTW92ZSBnZXROb3JtYWxpemVkTUlNRVR5cGUgZnJvbSBXZWJLaXQgaW50byBN SU1FVHlwZVJlZ2lzdHJ5LiBUaGlzIHdheSB3ZSBzdXBwb3J0IHVuY29tbW9uIG1pbWUgdHlwZXMg bGlrZSBpbWFnZS9wanBlZworICAgICAgICBhbmQgaW1hZ2UveC1tcy1ibXAgb3V0IG9mIHRoZSBi b3ggc2luY2Ugd2UgbWFwIHRvIHRoZSBtb3JlIGNvbW1vbiBpbWFnZS9qcGVnIGFuZCBpbWFnZS9i bXAgcmVzcGVjdGl2ZWx5LgorCisgICAgICAgICogcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjppbml0aWFsaXplU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMp OgorICAgICAgICAoV2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1J TUVUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVk SW1hZ2VSZXNvdXJjZU1JTUVUeXBlKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2Vi Q29yZTo6bWltZVR5cGVBc3NvY2lhdGlvbk1hcCk6CisgICAgICAgIChXZWJDb3JlOjpNSU1FVHlw ZVJlZ2lzdHJ5OjpnZXROb3JtYWxpemVkTUlNRVR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL01J TUVUeXBlUmVnaXN0cnkuaDoKKyAgICAgICAgKE1JTUVUeXBlUmVnaXN0cnkpOgorCiAyMDEyLTA1 LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IEVYQ19CQURfQUNDRVNTIGluIERPTSBicmVha3BvaW50IHByb2Nlc3Npbmcg Y29kZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDQxM2YxMWVkMTk1MjY2MzJi OTAzMDBiNTQzYWRiZDA4NTczODFjYTIuLjcxN2Y2Y2FiMzU0NTE0MjI0MTA3NzdlZjAzODkwMjZi OGE4NTBiZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBA CisyMDEyLTA1LTA0ICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNr QmVycnldIFJlbmRlcmluZyBibXAgZmlsZSBhcyB0ZXh0IGZpbGUgd2hlbiBDb250ZW50LVR5cGU6 aW1hZ2UveC1tcy1ibXAgZnJvbSBhcGFjaGUgd2ViIHNlcnZlci4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1MDM2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSBnZXROb3JtYWxpemVkTUlNRVR5cGUg aW50byBXZWJDb3JlOjpNSU1FVHlwZVJlZ2lzdHJ5LgorCisgICAgICAgICogQXBpL1dlYlNldHRp bmdzLmNwcDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OldlYlNldHRpbmdzOjppc1N1cHBvcnRlZE9iamVjdE1JTUVUeXBlKToKKyAgICAgICAgKiBBcGkv V2ViU2V0dGluZ3MuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFj a0JlcnJ5OjpjcmVhdGVQbHVnaW4pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5OjpjYW5TaG93TUlNRVR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXJDbGllbnRCbGFja0JlcnJ5OjpvYmplY3RDb250ZW50VHlwZSk6CisKIDIwMTItMDQtMTgg IEpvbiBIb25leWN1dHQgIDxqaG9uZXljdXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBGcmFtZUxv YWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsU2VuZFN1Ym1pdEV2ZW50KCkgc2hvdWxkIGJlIGdpdmVu IG1vcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0 cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKaW5k ZXggYjQ4MzBjZDU1OTExMjdiZWQ4MWQ0M2I3ZjQ0ZjI3MDU4MWY1NWVmZi4uZjNhOWNjZDE4NzI3 ZTNhZDVlZjYxZmQ5OWIwODNmMzc3MjQwMDA4NSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKQEAgLTI1OSwxMCArMjU5LDYgQEAgc3RhdGljIHZvaWQg aW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRVR5cGVzKCkKICAgICAgICAgc3VwcG9ydGVkSW1h Z2VNSU1FVHlwZXMtPmFkZCh0eXBlc1tpXSk7CiAgICAgICAgIHN1cHBvcnRlZEltYWdlUmVzb3Vy Y2VNSU1FVHlwZXMtPmFkZCh0eXBlc1tpXSk7CiAgICAgfQotI2lmIFBMQVRGT1JNKEJMQUNLQkVS UlkpCi0gICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMtPmFkZCgiaW1hZ2UvcGpwZWciKTsKLSAg ICBzdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGVzLT5hZGQoImltYWdlL3BqcGVnIik7Ci0j ZW5kaWYKICNlbmRpZgogfQogCkBAIC01MTMsNyArNTA5LDcgQEAgYm9vbCBNSU1FVHlwZVJlZ2lz dHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMpCiAg ICAgICAgIGluaXRpYWxpemVNSU1FVHlwZVJlZ2lzdHJ5KCk7Ci0gICAgcmV0dXJuIHN1cHBvcnRl ZEltYWdlTUlNRVR5cGVzLT5jb250YWlucyhtaW1lVHlwZSk7CisgICAgcmV0dXJuIHN1cHBvcnRl ZEltYWdlTUlNRVR5cGVzLT5jb250YWlucyhnZXROb3JtYWxpemVkTUlNRVR5cGUobWltZVR5cGUp KTsKIH0KIAogYm9vbCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlUmVzb3VyY2VN SU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQpAQCAtNTIyLDcgKzUxOCw3IEBAIGJvb2wg TUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGUoY29uc3Qg U3RyaW5nJiBtaW1lVHlwZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghc3VwcG9y dGVkSW1hZ2VSZXNvdXJjZU1JTUVUeXBlcykKICAgICAgICAgaW5pdGlhbGl6ZU1JTUVUeXBlUmVn aXN0cnkoKTsKLSAgICByZXR1cm4gc3VwcG9ydGVkSW1hZ2VSZXNvdXJjZU1JTUVUeXBlcy0+Y29u dGFpbnMobWltZVR5cGUpOworICAgIHJldHVybiBzdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5 cGVzLT5jb250YWlucyhnZXROb3JtYWxpemVkTUlNRVR5cGUobWltZVR5cGUpKTsKIH0KIAogYm9v bCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGVGb3JFbmNvZGluZyhj b25zdCBTdHJpbmcmIG1pbWVUeXBlKQpAQCAtNjMxLDQgKzYyNyw3NSBAQCBjb25zdCBTdHJpbmcm IGRlZmF1bHRNSU1FVHlwZSgpCiAgICAgcmV0dXJuIGRlZmF1bHRNSU1FVHlwZTsKIH0KIAorI2lm IFBMQVRGT1JNKEJMQUNLQkVSUlkpCit0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+IE1J TUVUeXBlQXNzb2NpYXRpb25NYXA7CisKK3N0YXRpYyBjb25zdCBNSU1FVHlwZUFzc29jaWF0aW9u TWFwJiBtaW1lVHlwZUFzc29jaWF0aW9uTWFwKCkKK3sKKyAgICBzdGF0aWMgTUlNRVR5cGVBc3Nv Y2lhdGlvbk1hcCogbWltZVR5cGVNYXAgPSAwOworICAgIGlmIChtaW1lVHlwZU1hcCkKKyAgICAg ICAgcmV0dXJuICptaW1lVHlwZU1hcDsKKworICAgIG1pbWVUeXBlTWFwID0gbmV3IE1JTUVUeXBl QXNzb2NpYXRpb25NYXA7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1tcy1ibXAiLCAi aW1hZ2UvYm1wIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC13aW5kb3dzLWJtcCIs ICJpbWFnZS9ibXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LWJtcCIsICJpbWFn ZS9ibXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LWJpdG1hcCIsICJpbWFnZS9i bXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LW1zLWJpdG1hcCIsICJpbWFnZS9i bXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS9qcGciLCAiaW1hZ2UvanBlZyIpOwor ICAgIG1pbWVUeXBlTWFwLT5hZGQoImltYWdlL3BqcGVnIiwgImltYWdlL2pwZWciKTsKKyAgICBt aW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LXBuZyIsICJpbWFnZS9wbmciKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJpbWFnZS92bmQucmltLnBuZyIsICJpbWFnZS9wbmciKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJpbWFnZS9pY28iLCAiaW1hZ2Uvdm5kLm1pY3Jvc29mdC5pY29uIik7CisgICAg bWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UvaWNvbiIsICJpbWFnZS92bmQubWljcm9zb2Z0Lmljb24i KTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJ0ZXh0L2ljbyIsICJpbWFnZS92bmQubWljcm9zb2Z0 Lmljb24iKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhcHBsaWNhdGlvbi9pY28iLCAiaW1hZ2Uv dm5kLm1pY3Jvc29mdC5pY29uIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1pY29u IiwgImltYWdlL3ZuZC5taWNyb3NvZnQuaWNvbiIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1 ZGlvL3ZuZC5xY2VscCIsICJhdWRpby9xY2VscCIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1 ZGlvL3FjcCIsICJhdWRpby9xY2VscCIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3Zu ZC5xY3AiLCAiYXVkaW8vcWNlbHAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby93YXYi LCAiYXVkaW8veC13YXYiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby9taWQiLCAiYXVk aW8vbWlkaSIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3NwLW1pZGkiLCAiYXVkaW8v bWlkaSIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3gtbWlkIiwgImF1ZGlvL21pZGki KTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1pZGkiLCAiYXVkaW8vbWlkaSIpOwor ICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3gtbXBlZyIsICJhdWRpby9tcGVnIik7CisgICAg bWltZVR5cGVNYXAtPmFkZCgiYXVkaW8vbXAzIiwgImF1ZGlvL21wZWciKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJhdWRpby94LW1wMyIsICJhdWRpby9tcGVnIik7CisgICAgbWltZVR5cGVNYXAt PmFkZCgiYXVkaW8vbXBlZzMiLCAiYXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQo ImF1ZGlvL3gtbXBlZzMiLCAiYXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1 ZGlvL21wZzMiLCAiYXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL21w ZyIsICJhdWRpby9tcGVnIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1tcGciLCAi YXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL200YSIsICJhdWRpby9t cDQiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW00YSIsICJhdWRpby9tcDQiKTsK KyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1wNCIsICJhdWRpby9tcDQiKTsKKyAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LWFhYyIsICJhdWRpby9hYWMiKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJhdWRpby94LWFtciIsICJhdWRpby9hbXIiKTsKKyAgICBtaW1lVHlwZU1hcC0+ YWRkKCJhdWRpby9tcGVndXJsIiwgImF1ZGlvL3gtbXBlZ3VybCIpOworICAgIG1pbWVUeXBlTWFw LT5hZGQoImF1ZGlvL2ZsYWMiLCAiYXVkaW8veC1mbGFjIik7CisgICAgbWltZVR5cGVNYXAtPmFk ZCgidmlkZW8vM2dwIiwgInZpZGVvLzNncHAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJ2aWRl by9hdmkiLCAidmlkZW8veC1tc3ZpZGVvIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgidmlkZW8v eC1tNHYiLCAidmlkZW8vbXA0Iik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgidmlkZW8veC1xdWlj a3RpbWUiLCAidmlkZW8vcXVpY2t0aW1lIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiYXBwbGlj YXRpb24vamF2YSIsICJhcHBsaWNhdGlvbi9qYXZhLWFyY2hpdmUiKTsKKyAgICBtaW1lVHlwZU1h cC0+YWRkKCJhcHBsaWNhdGlvbi94LWphdmEtYXJjaGl2ZSIsICJhcHBsaWNhdGlvbi9qYXZhLWFy Y2hpdmUiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhcHBsaWNhdGlvbi94LXppcC1jb21wcmVz c2VkIiwgImFwcGxpY2F0aW9uL3ppcCIpOworCisgICAgcmV0dXJuICptaW1lVHlwZU1hcDsKK30K KyNlbmRpZgorCitTdHJpbmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBl KGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCit7CisjaWYgUExBVEZPUk0oQkxBQ0tCRVJSWSkKKyAg ICBNSU1FVHlwZUFzc29jaWF0aW9uTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1pbWVUeXBlQXNz b2NpYXRpb25NYXAoKS5maW5kKG1pbWVUeXBlKTsKKworICAgIHJldHVybiBpdCA9PSBtaW1lVHlw ZUFzc29jaWF0aW9uTWFwKCkuZW5kKCkgPyBtaW1lVHlwZSA6IGl0LT5zZWNvbmQ7CisjZWxzZQor ICAgIHJldHVybiBtaW1lVHlwZTsKKyNlbmRpZgorfQorCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnku aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuaAppbmRleCA3ZmE2 ZGI2ZDdjNDU5ZWRhNzZmNDk0Y2Q0NTRjN2I2MzMwNjE3MDA4Li5iY2ZlZGNhMTQ4NTI0OGFmNjFj YTBjOGQ5OThkNWVhNDA0NzQxNTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9NSU1FVHlwZVJlZ2lzdHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5 cGVSZWdpc3RyeS5oCkBAIC04NCw2ICs4NCw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgSGFzaFNl dDxTdHJpbmc+JiBnZXRTdXBwb3J0ZWROb25JbWFnZU1JTUVUeXBlcygpOwogICAgIHN0YXRpYyBI YXNoU2V0PFN0cmluZz4mIGdldFN1cHBvcnRlZE1lZGlhTUlNRVR5cGVzKCk7CiAgICAgc3RhdGlj IEhhc2hTZXQ8U3RyaW5nPiYgZ2V0VW5zdXBwb3J0ZWRUZXh0TUlNRVR5cGVzKCk7CisKKyAgICBz dGF0aWMgU3RyaW5nIGdldE5vcm1hbGl6ZWRNSU1FVHlwZShjb25zdCBTdHJpbmcmKTsKIH07CiAK IGNvbnN0IFN0cmluZyYgZGVmYXVsdE1JTUVUeXBlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCmluZGV4IGMwZTI4ODEzMThmNDdmZjc0ZGZiMDAzYzU3 ZGRiNGIwZjU4OGI5N2IuLjRjNTI4NTI3MDFlNzExYTgwYzI1ZGIwMjI4OTNhMjY2YWIwOTYxNTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCkBAIC0x OSw2ICsxOSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiV2ViU2V0dGluZ3Mu aCIKIAorI2luY2x1ZGUgIk1JTUVUeXBlUmVnaXN0cnkuaCIKICNpbmNsdWRlICJXZWJTZXR0aW5n c19wLmgiCiAKICNpbmNsdWRlICJXZWJTdHJpbmcuaCIKQEAgLTg0LDY1ICs4NSw2IEBAIERFRklO RV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBXZWJLaXRVc2VyU3R5bGVTaGVldExvY2F0aW9uLCAoIldl YktpdFVzZXJTdHlsZVNoZWV0CiBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgV2ViS2l0V2Vi U29ja2V0c0VuYWJsZWQsICgiV2ViS2l0V2ViU29ja2V0c0VuYWJsZWQiKSk7CiBERUZJTkVfU1RB VElDX0xPQ0FMKFN0cmluZywgV2ViS2l0WFNTQXVkaXRvckVuYWJsZWQsICgiV2ViS2l0WFNTQXVk aXRvckVuYWJsZWQiKSk7CiAKLS8vIEZJWE1FOiBXZSBzaG91bGQgY29uc2lkZXIgbW92aW5nIGFs bCB0aGUgbWltZSB0eXBlIGNvZGUgaW50byBpdHMgb3duIG9iamVjdC4KLQotdHlwZWRlZiBIYXNo TWFwPFN0cmluZywgV2ViU3RyaW5nPiBNSU1FVHlwZUFzc29jaWF0aW9uTWFwOwotCi1zdGF0aWMg Y29uc3QgTUlNRVR5cGVBc3NvY2lhdGlvbk1hcCYgbWltZVR5cGVBc3NvY2lhdGlvbk1hcCgpCi17 Ci0gICAgc3RhdGljIE1JTUVUeXBlQXNzb2NpYXRpb25NYXAqIG1pbWVUeXBlTWFwID0gMDsKLSAg ICBpZiAobWltZVR5cGVNYXApCi0gICAgICAgIHJldHVybiAqbWltZVR5cGVNYXA7Ci0KLSAgICBt aW1lVHlwZU1hcCA9IG5ldyBNSU1FVHlwZUFzc29jaWF0aW9uTWFwOwotICAgIG1pbWVUeXBlTWFw LT5hZGQoImltYWdlL3gtbXMtYm1wIiwgImltYWdlL2JtcCIpOwotICAgIG1pbWVUeXBlTWFwLT5h ZGQoImltYWdlL3gtd2luZG93cy1ibXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAt PmFkZCgiaW1hZ2UveC1ibXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgi aW1hZ2UveC1iaXRtYXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1h Z2UveC1tcy1iaXRtYXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1h Z2UvanBnIiwgImltYWdlL2pwZWciKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS9wanBl ZyIsICJpbWFnZS9qcGVnIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1wbmciLCAi aW1hZ2UvcG5nIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2Uvdm5kLnJpbS5wbmciLCAi aW1hZ2UvcG5nIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UvaWNvIiwgImltYWdlL3Zu ZC5taWNyb3NvZnQuaWNvbiIpOwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImltYWdlL2ljb24iLCAi aW1hZ2Uvdm5kLm1pY3Jvc29mdC5pY29uIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgidGV4dC9p Y28iLCAiaW1hZ2Uvdm5kLm1pY3Jvc29mdC5pY29uIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgi YXBwbGljYXRpb24vaWNvIiwgImltYWdlL3ZuZC5taWNyb3NvZnQuaWNvbiIpOwotICAgIG1pbWVU eXBlTWFwLT5hZGQoImltYWdlL3gtaWNvbiIsICJpbWFnZS92bmQubWljcm9zb2Z0Lmljb24iKTsK LSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby92bmQucWNlbHAiLCAiYXVkaW8vcWNlbHAiKTsK LSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby9xY3AiLCAiYXVkaW8vcWNlbHAiKTsKLSAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby92bmQucWNwIiwgImF1ZGlvL3FjZWxwIik7Ci0gICAgbWlt ZVR5cGVNYXAtPmFkZCgiYXVkaW8vd2F2IiwgImF1ZGlvL3gtd2F2Iik7Ci0gICAgbWltZVR5cGVN YXAtPmFkZCgiYXVkaW8vbWlkIiwgImF1ZGlvL21pZGkiKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRk KCJhdWRpby9zcC1taWRpIiwgImF1ZGlvL21pZGkiKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJh dWRpby94LW1pZCIsICJhdWRpby9taWRpIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8v eC1taWRpIiwgImF1ZGlvL21pZGkiKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1w ZWciLCAiYXVkaW8vbXBlZyIpOwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL21wMyIsICJh dWRpby9tcGVnIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1tcDMiLCAiYXVkaW8v bXBlZyIpOwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL21wZWczIiwgImF1ZGlvL21wZWci KTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1wZWczIiwgImF1ZGlvL21wZWciKTsK LSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby9tcGczIiwgImF1ZGlvL21wZWciKTsKLSAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby9tcGciLCAiYXVkaW8vbXBlZyIpOwotICAgIG1pbWVUeXBl TWFwLT5hZGQoImF1ZGlvL3gtbXBnIiwgImF1ZGlvL21wZWciKTsKLSAgICBtaW1lVHlwZU1hcC0+ YWRkKCJhdWRpby9tNGEiLCAiYXVkaW8vbXA0Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVk aW8veC1tNGEiLCAiYXVkaW8vbXA0Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1t cDQiLCAiYXVkaW8vbXA0Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1hYWMiLCAi YXVkaW8vYWFjIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1hbXIiLCAiYXVkaW8v YW1yIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8vbXBlZ3VybCIsICJhdWRpby94LW1w ZWd1cmwiKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby9mbGFjIiwgImF1ZGlvL3gtZmxh YyIpOwotICAgIG1pbWVUeXBlTWFwLT5hZGQoInZpZGVvLzNncCIsICJ2aWRlby8zZ3BwIik7Ci0g ICAgbWltZVR5cGVNYXAtPmFkZCgidmlkZW8vYXZpIiwgInZpZGVvL3gtbXN2aWRlbyIpOwotICAg IG1pbWVUeXBlTWFwLT5hZGQoInZpZGVvL3gtbTR2IiwgInZpZGVvL21wNCIpOwotICAgIG1pbWVU eXBlTWFwLT5hZGQoInZpZGVvL3gtcXVpY2t0aW1lIiwgInZpZGVvL3F1aWNrdGltZSIpOwotICAg IG1pbWVUeXBlTWFwLT5hZGQoImFwcGxpY2F0aW9uL2phdmEiLCAiYXBwbGljYXRpb24vamF2YS1h cmNoaXZlIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXBwbGljYXRpb24veC1qYXZhLWFyY2hp dmUiLCAiYXBwbGljYXRpb24vamF2YS1hcmNoaXZlIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgi YXBwbGljYXRpb24veC16aXAtY29tcHJlc3NlZCIsICJhcHBsaWNhdGlvbi96aXAiKTsKLQotICAg IHJldHVybiAqbWltZVR5cGVNYXA7Ci19Ci0KIHN0YXRpYyBIYXNoU2V0PFN0cmluZz4qIHNfc3Vw cG9ydGVkT2JqZWN0TUlNRVR5cGVzOwogCiBXZWJTZXR0aW5nc1ByaXZhdGU6OldlYlNldHRpbmdz UHJpdmF0ZSgpCkBAIC0yNTQsMTQgKzE5Niw3IEBAIGJvb2wgV2ViU2V0dGluZ3M6OmlzU3VwcG9y dGVkT2JqZWN0TUlNRVR5cGUoY29uc3QgV2ViU3RyaW5nJiBtaW1lVHlwZSkKICAgICBpZiAoIXNf c3VwcG9ydGVkT2JqZWN0TUlNRVR5cGVzKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBy ZXR1cm4gc19zdXBwb3J0ZWRPYmplY3RNSU1FVHlwZXMtPmNvbnRhaW5zKGdldE5vcm1hbGl6ZWRN SU1FVHlwZShtaW1lVHlwZSkpOwotfQotCi1XZWJTdHJpbmcgV2ViU2V0dGluZ3M6OmdldE5vcm1h bGl6ZWRNSU1FVHlwZShjb25zdCBXZWJTdHJpbmcmIHR5cGUpCi17Ci0gICAgTUlNRVR5cGVBc3Nv Y2lhdGlvbk1hcDo6Y29uc3RfaXRlcmF0b3IgaSA9IG1pbWVUeXBlQXNzb2NpYXRpb25NYXAoKS5m aW5kKHR5cGUpOwotCi0gICAgcmV0dXJuIGkgPT0gbWltZVR5cGVBc3NvY2lhdGlvbk1hcCgpLmVu ZCgpID8gdHlwZSA6IGktPnNlY29uZDsKKyAgICByZXR1cm4gc19zdXBwb3J0ZWRPYmplY3RNSU1F VHlwZXMtPmNvbnRhaW5zKE1JTUVUeXBlUmVnaXN0cnk6OmdldE5vcm1hbGl6ZWRNSU1FVHlwZSht aW1lVHlwZSkpOwogfQogCiBib29sIFdlYlNldHRpbmdzOjp4c3NBdWRpdG9yRW5hYmxlZCgpIGNv bnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdz LmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmgKaW5kZXggNzk2 NmU1Zjc3ZjBhYjk0ODVhMmM4ZWNhODQzNzVmZjAzZWQ5ZWEwYi4uMmEyM2I1ZjkwMWYwOTMxMTdm ZTk2ZTY5Yjg4YjE2ZjA3NTNlMWRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv V2ViU2V0dGluZ3MuaApAQCAtNTYsNyArNTYsNiBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgdm9p ZCBhZGRTdXBwb3J0ZWRPYmplY3RQbHVnaW5NSU1FVHlwZShjb25zdCBjaGFyKik7CiAgICAgc3Rh dGljIGJvb2wgaXNTdXBwb3J0ZWRPYmplY3RNSU1FVHlwZShjb25zdCBXZWJTdHJpbmcmKTsKLSAg ICBzdGF0aWMgV2ViU3RyaW5nIGdldE5vcm1hbGl6ZWRNSU1FVHlwZShjb25zdCBXZWJTdHJpbmcm KTsKIAogICAgIGJvb2wgeHNzQXVkaXRvckVuYWJsZWQoKSBjb25zdDsKICAgICB2b2lkIHNldFhT U0F1ZGl0b3JFbmFibGVkKGJvb2wpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFj a0JlcnJ5LmNwcAppbmRleCBlZTgxYjdhNjBmZDBhZWZkZTRkMGViZjRmM2MzNTdlZTlkMTc0Nzk3 Li5jNjYyOTM3NzM0YzgzYTE0ZjU1NTljM2MwMDQ3MGQ0YzBkNjI4NTdlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRC bGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcApAQCAtMzIwLDcgKzMyMCw3IEBAIFBh c3NSZWZQdHI8V2lkZ2V0PiBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmNyZWF0ZVBsdWdp bihjb25zdCBJbnRTaXplJiBwbHVnCiAgICAgU3RyaW5nIG1pbWVUeXBlKG1pbWVUeXBlSW4pOwog ICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpIHsKICAgICAgICAgbWltZVR5cGUgPSBNSU1FVHlw ZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvclBhdGgodXJsLnBhdGgoKSk7Ci0gICAgICAgIG1pbWVU eXBlID0gV2ViU2V0dGluZ3M6OmdldE5vcm1hbGl6ZWRNSU1FVHlwZShtaW1lVHlwZSk7CisgICAg ICAgIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBlKG1p bWVUeXBlKTsKICAgICAgICAgaWYgKG1pbWVUeXBlICE9ICJhcHBsaWNhdGlvbi94LXNob2Nrd2F2 ZS1mbGFzaCIpCiAgICAgICAgICAgICBtaW1lVHlwZSA9IG1pbWVUeXBlSW47CiAgICAgfQpAQCAt NDU2LDcgKzQ1Niw3IEBAIGJvb2wgRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpjYW5IYW5k bGVSZXF1ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYpIGNvbnN0CiBib29sIEZyYW1lTG9hZGVy Q2xpZW50QmxhY2tCZXJyeTo6Y2FuU2hvd01JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGVJ bikgY29uc3QKIHsKICAgICAvLyBHZXQgbm9ybWFsaXplZCB0eXBlLgotICAgIFN0cmluZyBtaW1l VHlwZSA9IFdlYlNldHRpbmdzOjpnZXROb3JtYWxpemVkTUlNRVR5cGUobWltZVR5cGVJbik7Cisg ICAgU3RyaW5nIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0Tm9ybWFsaXplZE1JTUVU eXBlKG1pbWVUeXBlSW4pOwogCiAgICAgLy8gRklYTUU6IFNlZW1zIG5vIG90aGVyIHBvcnQgY2hl Y2tzIGVtcHR5IE1JTUUgdHlwZSBpbiB0aGlzIGZ1bmN0aW9uLiBTaG91bGQgd2UgZG8gdGhhdD8K ICAgICByZXR1cm4gTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKG1p bWVUeXBlKSB8fCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUo bWltZVR5cGUpCkBAIC03NzMsNyArNzczLDcgQEAgT2JqZWN0Q29udGVudFR5cGUgRnJhbWVMb2Fk ZXJDbGllbnRCbGFja0JlcnJ5OjpvYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJMJiB1cmwKICAg ICAgICAgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvclBhdGgodXJs LnBhdGgoKSk7CiAKICAgICAvLyBHZXQgbWFwcGVkIHR5cGUuCi0gICAgbWltZVR5cGUgPSBXZWJT ZXR0aW5nczo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBlKG1pbWVUeXBlKTsKKyAgICBtaW1lVHlwZSA9 IE1JTUVUeXBlUmVnaXN0cnk6OmdldE5vcm1hbGl6ZWRNSU1FVHlwZShtaW1lVHlwZSk7CiAKICAg ICBPYmplY3RDb250ZW50VHlwZSBkZWZhdWx0VHlwZSA9IEZyYW1lTG9hZGVyOjpkZWZhdWx0T2Jq ZWN0Q29udGVudFR5cGUodXJsLCBtaW1lVHlwZSwgc2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdl cyk7CiAgICAgaWYgKGRlZmF1bHRUeXBlICE9IE9iamVjdENvbnRlbnROb25lKQo= 140298 2012-05-04 12:31:03 -0700 2012-05-04 12:38:11 -0700 Patch bug-85036-20120504153125.patch text/plain 14633 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmE0NGI3MTk2OTJhMjEw Nzc5ZWE4YzgzYTA4YmRmMzdjOTQzMjMxNC4uN2Y2NjBlMzdjMTUyM2EzNjBiYjUxNTMwMDhhNWRh ZjU1NjJkNWRkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA1LTA0ICBSb2Ig QnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJlbmRlcmluZyBi bXAgZmlsZSBhcyB0ZXh0IGZpbGUgd2hlbiBDb250ZW50LVR5cGU6aW1hZ2UveC1tcy1ibXAgZnJv bSBhcGFjaGUgd2ViIHNlcnZlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg1MDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTW92ZSBnZXROb3JtYWxpemVkTUlNRVR5cGUgZnJvbSBXZWJLaXQgaW50byBN SU1FVHlwZVJlZ2lzdHJ5LiBUaGlzIHdheSB3ZSBzdXBwb3J0IHVuY29tbW9uIG1pbWUgdHlwZXMg bGlrZSBpbWFnZS9wanBlZworICAgICAgICBhbmQgaW1hZ2UveC1tcy1ibXAgb3V0IG9mIHRoZSBi b3ggc2luY2Ugd2UgbWFwIHRvIHRoZSBtb3JlIGNvbW1vbiBpbWFnZS9qcGVnIGFuZCBpbWFnZS9i bXAgcmVzcGVjdGl2ZWx5LgorCisgICAgICAgICogcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjppbml0aWFsaXplU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMp OgorICAgICAgICAoV2ViQ29yZTo6TUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1J TUVUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVk SW1hZ2VSZXNvdXJjZU1JTUVUeXBlKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2Vi Q29yZTo6bWltZVR5cGVBc3NvY2lhdGlvbk1hcCk6CisgICAgICAgIChXZWJDb3JlOjpNSU1FVHlw ZVJlZ2lzdHJ5OjpnZXROb3JtYWxpemVkTUlNRVR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL01J TUVUeXBlUmVnaXN0cnkuaDoKKyAgICAgICAgKE1JTUVUeXBlUmVnaXN0cnkpOgorCiAyMDEyLTA1 LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IEVYQ19CQURfQUNDRVNTIGluIERPTSBicmVha3BvaW50IHByb2Nlc3Npbmcg Y29kZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDQxM2YxMWVkMTk1MjY2MzJi OTAzMDBiNTQzYWRiZDA4NTczODFjYTIuLjcxN2Y2Y2FiMzU0NTE0MjI0MTA3NzdlZjAzODkwMjZi OGE4NTBiZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBA CisyMDEyLTA1LTA0ICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNr QmVycnldIFJlbmRlcmluZyBibXAgZmlsZSBhcyB0ZXh0IGZpbGUgd2hlbiBDb250ZW50LVR5cGU6 aW1hZ2UveC1tcy1ibXAgZnJvbSBhcGFjaGUgd2ViIHNlcnZlci4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1MDM2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSBnZXROb3JtYWxpemVkTUlNRVR5cGUg aW50byBXZWJDb3JlOjpNSU1FVHlwZVJlZ2lzdHJ5LgorCisgICAgICAgICogQXBpL1dlYlNldHRp bmdzLmNwcDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OldlYlNldHRpbmdzOjppc1N1cHBvcnRlZE9iamVjdE1JTUVUeXBlKToKKyAgICAgICAgKiBBcGkv V2ViU2V0dGluZ3MuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFj a0JlcnJ5OjpjcmVhdGVQbHVnaW4pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5OjpjYW5TaG93TUlNRVR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXJDbGllbnRCbGFja0JlcnJ5OjpvYmplY3RDb250ZW50VHlwZSk6CisKIDIwMTItMDQtMTgg IEpvbiBIb25leWN1dHQgIDxqaG9uZXljdXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBGcmFtZUxv YWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsU2VuZFN1Ym1pdEV2ZW50KCkgc2hvdWxkIGJlIGdpdmVu IG1vcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0 cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKaW5k ZXggYjQ4MzBjZDU1OTExMjdiZWQ4MWQ0M2I3ZjQ0ZjI3MDU4MWY1NWVmZi4uZGUyYWNhNjcxOTM2 YzhhYjIwNTFhYjY3MmM2MGEyNzYzN2QzNWRjYSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAKQEAgLTI1OSwxMCArMjU5LDYgQEAgc3RhdGljIHZvaWQg aW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRVR5cGVzKCkKICAgICAgICAgc3VwcG9ydGVkSW1h Z2VNSU1FVHlwZXMtPmFkZCh0eXBlc1tpXSk7CiAgICAgICAgIHN1cHBvcnRlZEltYWdlUmVzb3Vy Y2VNSU1FVHlwZXMtPmFkZCh0eXBlc1tpXSk7CiAgICAgfQotI2lmIFBMQVRGT1JNKEJMQUNLQkVS UlkpCi0gICAgc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMtPmFkZCgiaW1hZ2UvcGpwZWciKTsKLSAg ICBzdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGVzLT5hZGQoImltYWdlL3BqcGVnIik7Ci0j ZW5kaWYKICNlbmRpZgogfQogCkBAIC01MTMsNyArNTA5LDcgQEAgYm9vbCBNSU1FVHlwZVJlZ2lz dHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghc3VwcG9ydGVkSW1hZ2VNSU1FVHlwZXMpCiAg ICAgICAgIGluaXRpYWxpemVNSU1FVHlwZVJlZ2lzdHJ5KCk7Ci0gICAgcmV0dXJuIHN1cHBvcnRl ZEltYWdlTUlNRVR5cGVzLT5jb250YWlucyhtaW1lVHlwZSk7CisgICAgcmV0dXJuIHN1cHBvcnRl ZEltYWdlTUlNRVR5cGVzLT5jb250YWlucyhnZXROb3JtYWxpemVkTUlNRVR5cGUobWltZVR5cGUp KTsKIH0KIAogYm9vbCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlUmVzb3VyY2VN SU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQpAQCAtNTIyLDcgKzUxOCw3IEBAIGJvb2wg TUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5cGUoY29uc3Qg U3RyaW5nJiBtaW1lVHlwZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghc3VwcG9y dGVkSW1hZ2VSZXNvdXJjZU1JTUVUeXBlcykKICAgICAgICAgaW5pdGlhbGl6ZU1JTUVUeXBlUmVn aXN0cnkoKTsKLSAgICByZXR1cm4gc3VwcG9ydGVkSW1hZ2VSZXNvdXJjZU1JTUVUeXBlcy0+Y29u dGFpbnMobWltZVR5cGUpOworICAgIHJldHVybiBzdXBwb3J0ZWRJbWFnZVJlc291cmNlTUlNRVR5 cGVzLT5jb250YWlucyhnZXROb3JtYWxpemVkTUlNRVR5cGUobWltZVR5cGUpKTsKIH0KIAogYm9v bCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGVGb3JFbmNvZGluZyhj b25zdCBTdHJpbmcmIG1pbWVUeXBlKQpAQCAtNjMxLDQgKzYyNyw3NSBAQCBjb25zdCBTdHJpbmcm IGRlZmF1bHRNSU1FVHlwZSgpCiAgICAgcmV0dXJuIGRlZmF1bHRNSU1FVHlwZTsKIH0KIAorI2lm IFBMQVRGT1JNKEJMQUNLQkVSUlkpCit0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+IE1J TUVUeXBlQXNzb2NpYXRpb25NYXA7CisKK3N0YXRpYyBjb25zdCBNSU1FVHlwZUFzc29jaWF0aW9u TWFwJiBtaW1lVHlwZUFzc29jaWF0aW9uTWFwKCkKK3sKKyAgICBzdGF0aWMgTUlNRVR5cGVBc3Nv Y2lhdGlvbk1hcCogbWltZVR5cGVNYXAgPSAwOworICAgIGlmIChtaW1lVHlwZU1hcCkKKyAgICAg ICAgcmV0dXJuICptaW1lVHlwZU1hcDsKKworICAgIG1pbWVUeXBlTWFwID0gbmV3IE1JTUVUeXBl QXNzb2NpYXRpb25NYXA7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1tcy1ibXAiLCAi aW1hZ2UvYm1wIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC13aW5kb3dzLWJtcCIs ICJpbWFnZS9ibXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LWJtcCIsICJpbWFn ZS9ibXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LWJpdG1hcCIsICJpbWFnZS9i bXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LW1zLWJpdG1hcCIsICJpbWFnZS9i bXAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS9qcGciLCAiaW1hZ2UvanBlZyIpOwor ICAgIG1pbWVUeXBlTWFwLT5hZGQoImltYWdlL3BqcGVnIiwgImltYWdlL2pwZWciKTsKKyAgICBt aW1lVHlwZU1hcC0+YWRkKCJpbWFnZS94LXBuZyIsICJpbWFnZS9wbmciKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJpbWFnZS92bmQucmltLnBuZyIsICJpbWFnZS9wbmciKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJpbWFnZS9pY28iLCAiaW1hZ2Uvdm5kLm1pY3Jvc29mdC5pY29uIik7CisgICAg bWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UvaWNvbiIsICJpbWFnZS92bmQubWljcm9zb2Z0Lmljb24i KTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJ0ZXh0L2ljbyIsICJpbWFnZS92bmQubWljcm9zb2Z0 Lmljb24iKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhcHBsaWNhdGlvbi9pY28iLCAiaW1hZ2Uv dm5kLm1pY3Jvc29mdC5pY29uIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1pY29u IiwgImltYWdlL3ZuZC5taWNyb3NvZnQuaWNvbiIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1 ZGlvL3ZuZC5xY2VscCIsICJhdWRpby9xY2VscCIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1 ZGlvL3FjcCIsICJhdWRpby9xY2VscCIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3Zu ZC5xY3AiLCAiYXVkaW8vcWNlbHAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby93YXYi LCAiYXVkaW8veC13YXYiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby9taWQiLCAiYXVk aW8vbWlkaSIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3NwLW1pZGkiLCAiYXVkaW8v bWlkaSIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3gtbWlkIiwgImF1ZGlvL21pZGki KTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1pZGkiLCAiYXVkaW8vbWlkaSIpOwor ICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL3gtbXBlZyIsICJhdWRpby9tcGVnIik7CisgICAg bWltZVR5cGVNYXAtPmFkZCgiYXVkaW8vbXAzIiwgImF1ZGlvL21wZWciKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJhdWRpby94LW1wMyIsICJhdWRpby9tcGVnIik7CisgICAgbWltZVR5cGVNYXAt PmFkZCgiYXVkaW8vbXBlZzMiLCAiYXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQo ImF1ZGlvL3gtbXBlZzMiLCAiYXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1 ZGlvL21wZzMiLCAiYXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL21w ZyIsICJhdWRpby9tcGVnIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1tcGciLCAi YXVkaW8vbXBlZyIpOworICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL200YSIsICJhdWRpby9t cDQiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW00YSIsICJhdWRpby9tcDQiKTsK KyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1wNCIsICJhdWRpby9tcDQiKTsKKyAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LWFhYyIsICJhdWRpby9hYWMiKTsKKyAgICBtaW1lVHlw ZU1hcC0+YWRkKCJhdWRpby94LWFtciIsICJhdWRpby9hbXIiKTsKKyAgICBtaW1lVHlwZU1hcC0+ YWRkKCJhdWRpby9tcGVndXJsIiwgImF1ZGlvL3gtbXBlZ3VybCIpOworICAgIG1pbWVUeXBlTWFw LT5hZGQoImF1ZGlvL2ZsYWMiLCAiYXVkaW8veC1mbGFjIik7CisgICAgbWltZVR5cGVNYXAtPmFk ZCgidmlkZW8vM2dwIiwgInZpZGVvLzNncHAiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJ2aWRl by9hdmkiLCAidmlkZW8veC1tc3ZpZGVvIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgidmlkZW8v eC1tNHYiLCAidmlkZW8vbXA0Iik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgidmlkZW8veC1xdWlj a3RpbWUiLCAidmlkZW8vcXVpY2t0aW1lIik7CisgICAgbWltZVR5cGVNYXAtPmFkZCgiYXBwbGlj YXRpb24vamF2YSIsICJhcHBsaWNhdGlvbi9qYXZhLWFyY2hpdmUiKTsKKyAgICBtaW1lVHlwZU1h cC0+YWRkKCJhcHBsaWNhdGlvbi94LWphdmEtYXJjaGl2ZSIsICJhcHBsaWNhdGlvbi9qYXZhLWFy Y2hpdmUiKTsKKyAgICBtaW1lVHlwZU1hcC0+YWRkKCJhcHBsaWNhdGlvbi94LXppcC1jb21wcmVz c2VkIiwgImFwcGxpY2F0aW9uL3ppcCIpOworCisgICAgcmV0dXJuICptaW1lVHlwZU1hcDsKK30K KyNlbmRpZgorCitTdHJpbmcgTUlNRVR5cGVSZWdpc3RyeTo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBl KGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCit7CisjaWYgUExBVEZPUk0oQkxBQ0tCRVJSWSkKKyAg ICBNSU1FVHlwZUFzc29jaWF0aW9uTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1pbWVUeXBlQXNz b2NpYXRpb25NYXAoKS5maW5kKG1pbWVUeXBlKTsKKworICAgIGlmIChpdCAhPSBtaW1lVHlwZUFz c29jaWF0aW9uTWFwKCkuZW5kKCkpCisgICAgICAgIHJldHVybiBpdC0+c2Vjb25kOworI2VuZGlm CisgICAgcmV0dXJuIG1pbWVUeXBlOworfQorCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuaAppbmRleCA3ZmE2ZGI2ZDdj NDU5ZWRhNzZmNDk0Y2Q0NTRjN2I2MzMwNjE3MDA4Li5iY2ZlZGNhMTQ4NTI0OGFmNjFjYTBjOGQ5 OThkNWVhNDA0NzQxNTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1F VHlwZVJlZ2lzdHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdp c3RyeS5oCkBAIC04NCw2ICs4NCw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgSGFzaFNldDxTdHJp bmc+JiBnZXRTdXBwb3J0ZWROb25JbWFnZU1JTUVUeXBlcygpOwogICAgIHN0YXRpYyBIYXNoU2V0 PFN0cmluZz4mIGdldFN1cHBvcnRlZE1lZGlhTUlNRVR5cGVzKCk7CiAgICAgc3RhdGljIEhhc2hT ZXQ8U3RyaW5nPiYgZ2V0VW5zdXBwb3J0ZWRUZXh0TUlNRVR5cGVzKCk7CisKKyAgICBzdGF0aWMg U3RyaW5nIGdldE5vcm1hbGl6ZWRNSU1FVHlwZShjb25zdCBTdHJpbmcmKTsKIH07CiAKIGNvbnN0 IFN0cmluZyYgZGVmYXVsdE1JTUVUeXBlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViU2V0dGluZ3MuY3BwCmluZGV4IGMwZTI4ODEzMThmNDdmZjc0ZGZiMDAzYzU3ZGRiNGIw ZjU4OGI5N2IuLjRjNTI4NTI3MDFlNzExYTgwYzI1ZGIwMjI4OTNhMjY2YWIwOTYxNTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCkBAIC0xOSw2ICsx OSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiV2ViU2V0dGluZ3MuaCIKIAor I2luY2x1ZGUgIk1JTUVUeXBlUmVnaXN0cnkuaCIKICNpbmNsdWRlICJXZWJTZXR0aW5nc19wLmgi CiAKICNpbmNsdWRlICJXZWJTdHJpbmcuaCIKQEAgLTg0LDY1ICs4NSw2IEBAIERFRklORV9TVEFU SUNfTE9DQUwoU3RyaW5nLCBXZWJLaXRVc2VyU3R5bGVTaGVldExvY2F0aW9uLCAoIldlYktpdFVz ZXJTdHlsZVNoZWV0CiBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgV2ViS2l0V2ViU29ja2V0 c0VuYWJsZWQsICgiV2ViS2l0V2ViU29ja2V0c0VuYWJsZWQiKSk7CiBERUZJTkVfU1RBVElDX0xP Q0FMKFN0cmluZywgV2ViS2l0WFNTQXVkaXRvckVuYWJsZWQsICgiV2ViS2l0WFNTQXVkaXRvckVu YWJsZWQiKSk7CiAKLS8vIEZJWE1FOiBXZSBzaG91bGQgY29uc2lkZXIgbW92aW5nIGFsbCB0aGUg bWltZSB0eXBlIGNvZGUgaW50byBpdHMgb3duIG9iamVjdC4KLQotdHlwZWRlZiBIYXNoTWFwPFN0 cmluZywgV2ViU3RyaW5nPiBNSU1FVHlwZUFzc29jaWF0aW9uTWFwOwotCi1zdGF0aWMgY29uc3Qg TUlNRVR5cGVBc3NvY2lhdGlvbk1hcCYgbWltZVR5cGVBc3NvY2lhdGlvbk1hcCgpCi17Ci0gICAg c3RhdGljIE1JTUVUeXBlQXNzb2NpYXRpb25NYXAqIG1pbWVUeXBlTWFwID0gMDsKLSAgICBpZiAo bWltZVR5cGVNYXApCi0gICAgICAgIHJldHVybiAqbWltZVR5cGVNYXA7Ci0KLSAgICBtaW1lVHlw ZU1hcCA9IG5ldyBNSU1FVHlwZUFzc29jaWF0aW9uTWFwOwotICAgIG1pbWVUeXBlTWFwLT5hZGQo ImltYWdlL3gtbXMtYm1wIiwgImltYWdlL2JtcCIpOwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImlt YWdlL3gtd2luZG93cy1ibXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgi aW1hZ2UveC1ibXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2Uv eC1iaXRtYXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1t cy1iaXRtYXAiLCAiaW1hZ2UvYm1wIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UvanBn IiwgImltYWdlL2pwZWciKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJpbWFnZS9wanBlZyIsICJp bWFnZS9qcGVnIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UveC1wbmciLCAiaW1hZ2Uv cG5nIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2Uvdm5kLnJpbS5wbmciLCAiaW1hZ2Uv cG5nIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiaW1hZ2UvaWNvIiwgImltYWdlL3ZuZC5taWNy b3NvZnQuaWNvbiIpOwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImltYWdlL2ljb24iLCAiaW1hZ2Uv dm5kLm1pY3Jvc29mdC5pY29uIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgidGV4dC9pY28iLCAi aW1hZ2Uvdm5kLm1pY3Jvc29mdC5pY29uIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXBwbGlj YXRpb24vaWNvIiwgImltYWdlL3ZuZC5taWNyb3NvZnQuaWNvbiIpOwotICAgIG1pbWVUeXBlTWFw LT5hZGQoImltYWdlL3gtaWNvbiIsICJpbWFnZS92bmQubWljcm9zb2Z0Lmljb24iKTsKLSAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby92bmQucWNlbHAiLCAiYXVkaW8vcWNlbHAiKTsKLSAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby9xY3AiLCAiYXVkaW8vcWNlbHAiKTsKLSAgICBtaW1lVHlw ZU1hcC0+YWRkKCJhdWRpby92bmQucWNwIiwgImF1ZGlvL3FjZWxwIik7Ci0gICAgbWltZVR5cGVN YXAtPmFkZCgiYXVkaW8vd2F2IiwgImF1ZGlvL3gtd2F2Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFk ZCgiYXVkaW8vbWlkIiwgImF1ZGlvL21pZGkiKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRp by9zcC1taWRpIiwgImF1ZGlvL21pZGkiKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94 LW1pZCIsICJhdWRpby9taWRpIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1taWRp IiwgImF1ZGlvL21pZGkiKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1wZWciLCAi YXVkaW8vbXBlZyIpOwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL21wMyIsICJhdWRpby9t cGVnIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1tcDMiLCAiYXVkaW8vbXBlZyIp OwotICAgIG1pbWVUeXBlTWFwLT5hZGQoImF1ZGlvL21wZWczIiwgImF1ZGlvL21wZWciKTsKLSAg ICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby94LW1wZWczIiwgImF1ZGlvL21wZWciKTsKLSAgICBt aW1lVHlwZU1hcC0+YWRkKCJhdWRpby9tcGczIiwgImF1ZGlvL21wZWciKTsKLSAgICBtaW1lVHlw ZU1hcC0+YWRkKCJhdWRpby9tcGciLCAiYXVkaW8vbXBlZyIpOwotICAgIG1pbWVUeXBlTWFwLT5h ZGQoImF1ZGlvL3gtbXBnIiwgImF1ZGlvL21wZWciKTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJh dWRpby9tNGEiLCAiYXVkaW8vbXA0Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1t NGEiLCAiYXVkaW8vbXA0Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1tcDQiLCAi YXVkaW8vbXA0Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1hYWMiLCAiYXVkaW8v YWFjIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8veC1hbXIiLCAiYXVkaW8vYW1yIik7 Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXVkaW8vbXBlZ3VybCIsICJhdWRpby94LW1wZWd1cmwi KTsKLSAgICBtaW1lVHlwZU1hcC0+YWRkKCJhdWRpby9mbGFjIiwgImF1ZGlvL3gtZmxhYyIpOwot ICAgIG1pbWVUeXBlTWFwLT5hZGQoInZpZGVvLzNncCIsICJ2aWRlby8zZ3BwIik7Ci0gICAgbWlt ZVR5cGVNYXAtPmFkZCgidmlkZW8vYXZpIiwgInZpZGVvL3gtbXN2aWRlbyIpOwotICAgIG1pbWVU eXBlTWFwLT5hZGQoInZpZGVvL3gtbTR2IiwgInZpZGVvL21wNCIpOwotICAgIG1pbWVUeXBlTWFw LT5hZGQoInZpZGVvL3gtcXVpY2t0aW1lIiwgInZpZGVvL3F1aWNrdGltZSIpOwotICAgIG1pbWVU eXBlTWFwLT5hZGQoImFwcGxpY2F0aW9uL2phdmEiLCAiYXBwbGljYXRpb24vamF2YS1hcmNoaXZl Iik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXBwbGljYXRpb24veC1qYXZhLWFyY2hpdmUiLCAi YXBwbGljYXRpb24vamF2YS1hcmNoaXZlIik7Ci0gICAgbWltZVR5cGVNYXAtPmFkZCgiYXBwbGlj YXRpb24veC16aXAtY29tcHJlc3NlZCIsICJhcHBsaWNhdGlvbi96aXAiKTsKLQotICAgIHJldHVy biAqbWltZVR5cGVNYXA7Ci19Ci0KIHN0YXRpYyBIYXNoU2V0PFN0cmluZz4qIHNfc3VwcG9ydGVk T2JqZWN0TUlNRVR5cGVzOwogCiBXZWJTZXR0aW5nc1ByaXZhdGU6OldlYlNldHRpbmdzUHJpdmF0 ZSgpCkBAIC0yNTQsMTQgKzE5Niw3IEBAIGJvb2wgV2ViU2V0dGluZ3M6OmlzU3VwcG9ydGVkT2Jq ZWN0TUlNRVR5cGUoY29uc3QgV2ViU3RyaW5nJiBtaW1lVHlwZSkKICAgICBpZiAoIXNfc3VwcG9y dGVkT2JqZWN0TUlNRVR5cGVzKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICByZXR1cm4g c19zdXBwb3J0ZWRPYmplY3RNSU1FVHlwZXMtPmNvbnRhaW5zKGdldE5vcm1hbGl6ZWRNSU1FVHlw ZShtaW1lVHlwZSkpOwotfQotCi1XZWJTdHJpbmcgV2ViU2V0dGluZ3M6OmdldE5vcm1hbGl6ZWRN SU1FVHlwZShjb25zdCBXZWJTdHJpbmcmIHR5cGUpCi17Ci0gICAgTUlNRVR5cGVBc3NvY2lhdGlv bk1hcDo6Y29uc3RfaXRlcmF0b3IgaSA9IG1pbWVUeXBlQXNzb2NpYXRpb25NYXAoKS5maW5kKHR5 cGUpOwotCi0gICAgcmV0dXJuIGkgPT0gbWltZVR5cGVBc3NvY2lhdGlvbk1hcCgpLmVuZCgpID8g dHlwZSA6IGktPnNlY29uZDsKKyAgICByZXR1cm4gc19zdXBwb3J0ZWRPYmplY3RNSU1FVHlwZXMt PmNvbnRhaW5zKE1JTUVUeXBlUmVnaXN0cnk6OmdldE5vcm1hbGl6ZWRNSU1FVHlwZShtaW1lVHlw ZSkpOwogfQogCiBib29sIFdlYlNldHRpbmdzOjp4c3NBdWRpdG9yRW5hYmxlZCgpIGNvbnN0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmggYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmgKaW5kZXggNzk2NmU1Zjc3 ZjBhYjk0ODVhMmM4ZWNhODQzNzVmZjAzZWQ5ZWEwYi4uMmEyM2I1ZjkwMWYwOTMxMTdmZTk2ZTY5 Yjg4YjE2ZjA3NTNlMWRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0 dGluZ3MuaApAQCAtNTYsNyArNTYsNiBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgdm9pZCBhZGRT dXBwb3J0ZWRPYmplY3RQbHVnaW5NSU1FVHlwZShjb25zdCBjaGFyKik7CiAgICAgc3RhdGljIGJv b2wgaXNTdXBwb3J0ZWRPYmplY3RNSU1FVHlwZShjb25zdCBXZWJTdHJpbmcmKTsKLSAgICBzdGF0 aWMgV2ViU3RyaW5nIGdldE5vcm1hbGl6ZWRNSU1FVHlwZShjb25zdCBXZWJTdHJpbmcmKTsKIAog ICAgIGJvb2wgeHNzQXVkaXRvckVuYWJsZWQoKSBjb25zdDsKICAgICB2b2lkIHNldFhTU0F1ZGl0 b3JFbmFibGVkKGJvb2wpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5 LmNwcAppbmRleCBlZTgxYjdhNjBmZDBhZWZkZTRkMGViZjRmM2MzNTdlZTlkMTc0Nzk3Li5jNjYy OTM3NzM0YzgzYTE0ZjU1NTljM2MwMDQ3MGQ0YzBkNjI4NTdlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0Jl cnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcApAQCAtMzIwLDcgKzMyMCw3IEBAIFBhc3NSZWZQ dHI8V2lkZ2V0PiBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmNyZWF0ZVBsdWdpbihjb25z dCBJbnRTaXplJiBwbHVnCiAgICAgU3RyaW5nIG1pbWVUeXBlKG1pbWVUeXBlSW4pOwogICAgIGlm IChtaW1lVHlwZS5pc0VtcHR5KCkpIHsKICAgICAgICAgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lz dHJ5OjpnZXRNSU1FVHlwZUZvclBhdGgodXJsLnBhdGgoKSk7Ci0gICAgICAgIG1pbWVUeXBlID0g V2ViU2V0dGluZ3M6OmdldE5vcm1hbGl6ZWRNSU1FVHlwZShtaW1lVHlwZSk7CisgICAgICAgIG1p bWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBlKG1pbWVUeXBl KTsKICAgICAgICAgaWYgKG1pbWVUeXBlICE9ICJhcHBsaWNhdGlvbi94LXNob2Nrd2F2ZS1mbGFz aCIpCiAgICAgICAgICAgICBtaW1lVHlwZSA9IG1pbWVUeXBlSW47CiAgICAgfQpAQCAtNDU2LDcg KzQ1Niw3IEBAIGJvb2wgRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpjYW5IYW5kbGVSZXF1 ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYpIGNvbnN0CiBib29sIEZyYW1lTG9hZGVyQ2xpZW50 QmxhY2tCZXJyeTo6Y2FuU2hvd01JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGVJbikgY29u c3QKIHsKICAgICAvLyBHZXQgbm9ybWFsaXplZCB0eXBlLgotICAgIFN0cmluZyBtaW1lVHlwZSA9 IFdlYlNldHRpbmdzOjpnZXROb3JtYWxpemVkTUlNRVR5cGUobWltZVR5cGVJbik7CisgICAgU3Ry aW5nIG1pbWVUeXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBlKG1p bWVUeXBlSW4pOwogCiAgICAgLy8gRklYTUU6IFNlZW1zIG5vIG90aGVyIHBvcnQgY2hlY2tzIGVt cHR5IE1JTUUgdHlwZSBpbiB0aGlzIGZ1bmN0aW9uLiBTaG91bGQgd2UgZG8gdGhhdD8KICAgICBy ZXR1cm4gTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKG1pbWVUeXBl KSB8fCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUobWltZVR5 cGUpCkBAIC03NzMsNyArNzczLDcgQEAgT2JqZWN0Q29udGVudFR5cGUgRnJhbWVMb2FkZXJDbGll bnRCbGFja0JlcnJ5OjpvYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJMJiB1cmwKICAgICAgICAg bWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvclBhdGgodXJsLnBhdGgo KSk7CiAKICAgICAvLyBHZXQgbWFwcGVkIHR5cGUuCi0gICAgbWltZVR5cGUgPSBXZWJTZXR0aW5n czo6Z2V0Tm9ybWFsaXplZE1JTUVUeXBlKG1pbWVUeXBlKTsKKyAgICBtaW1lVHlwZSA9IE1JTUVU eXBlUmVnaXN0cnk6OmdldE5vcm1hbGl6ZWRNSU1FVHlwZShtaW1lVHlwZSk7CiAKICAgICBPYmpl Y3RDb250ZW50VHlwZSBkZWZhdWx0VHlwZSA9IEZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29u dGVudFR5cGUodXJsLCBtaW1lVHlwZSwgc2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdlcyk7CiAg ICAgaWYgKGRlZmF1bHRUeXBlICE9IE9iamVjdENvbnRlbnROb25lKQo=