191189 2018-11-02 06:09:20 -0700 [GStreamer] Move elements registration to GStreamerCommon 2018-11-05 02:01:36 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 191191 1 pnormand pnormand calvaris webkit-bug-importer oldest_to_newest 1474458 0 pnormand 2018-11-02 06:09:20 -0700 This is only a refactoring. 1474459 1 353690 pnormand 2018-11-02 06:16:14 -0700 Created attachment 353690 Patch 1474490 2 353690 calvaris 2018-11-02 08:14:56 -0700 Comment on attachment 353690 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=353690&action=review > Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:53 > +#if ENABLE(VIDEO) Shouldn't this enclose more of the includes above? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:-152 > -GST_DEBUG_CATEGORY(webkit_media_player_debug); > +GST_DEBUG_CATEGORY_EXTERN(webkit_media_player_debug); > #define GST_CAT_DEFAULT webkit_media_player_debug > > > namespace WebCore { > using namespace std; > > -bool MediaPlayerPrivateGStreamerBase::initializeGStreamerAndRegisterWebKitElements() > -{ > - if (!initializeGStreamer()) > - return false; > - > - static std::once_flag onceFlag; > - std::call_once(onceFlag, [] { > - GST_DEBUG_CATEGORY_INIT(webkit_media_player_debug, "webkitmediaplayer", 0, "WebKit media player"); This is conceptually weird for me. The category variable should "live" in Base.cpp and be initialized here since it's the superclass. I understand you really want to get rid of this method but IMHO, I think we should keep a very small version of it because of the initialization of this variable, keep the _CATEGORY( here and have the _CATEGORY_EXTERN( in the subclass. 1474530 3 353690 pnormand 2018-11-02 10:03:39 -0700 Comment on attachment 353690 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=353690&action=review >> Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:53 >> +#if ENABLE(VIDEO) > > Shouldn't this enclose more of the includes above? I don't think it's necessary because MSE, MediaStream and EME are already declared as depending on VIDEO in WebKitFeatures.cmake. >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:-152 >> - GST_DEBUG_CATEGORY_INIT(webkit_media_player_debug, "webkitmediaplayer", 0, "WebKit media player"); > > This is conceptually weird for me. The category variable should "live" in Base.cpp and be initialized here since it's the superclass. I understand you really want to get rid of this method but IMHO, I think we should keep a very small version of it because of the initialization of this variable, keep the _CATEGORY( here and have the _CATEGORY_EXTERN( in the subclass. The MSE player already uses its own debug category. Maybe we could have a separate category for the base player after all :) Anyway, for the time being i'll keep a small init function then. 1474556 4 353712 pnormand 2018-11-02 10:40:46 -0700 Created attachment 353712 Patch 1475000 5 pnormand 2018-11-05 02:00:37 -0800 Committed r237794: <https://trac.webkit.org/changeset/237794> 1475001 6 webkit-bug-importer 2018-11-05 02:01:36 -0800 <rdar://problem/45802528> 353690 2018-11-02 06:16:14 -0700 2018-11-02 10:40:42 -0700 Patch bug-191189-20181102131612.patch text/plain 11980 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3NzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWMxZDBmYmJiN2FkODFi ODgxYWM1OGZmZDIwZDZiMzRhZjdiMGZmNS4uM2M5NjYzNzM1Y2Q4YjJkMDJlZmVlMmQzNzc5OWQ0 MzFiY2NlNjcwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE4LTExLTAyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBNb3ZlIGVsZW1lbnRzIHJlZ2lzdHJhdGlvbiB0byBHU3RyZWFtZXJDb21tb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTE4OQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IHdhcyBhIGJpdCBvZGQg dG8gaGF2ZSB0aGlzIGluIHRoZSBiYXNlIHBsYXllciBjbGFzcyBhbmQgdG8gaGF2ZQorICAgICAg ICBzdWItY2xhc3NlcyBjYWxsaW5nIGEgc3RhdGljIGZ1bmN0aW9uIG9mIHRoZSBzdXBlci1jbGFz cy4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjppbml0aWFsaXplR1N0cmVhbWVyQW5kUmVnaXN0ZXJXZWJLaXRFbGVtZW50cyk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjppc0F2YWlsYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OmxvYWRGdWxsKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6Z2V0U3VwcG9ydGVkVHlwZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRTo6cmVnaXN0ZXJNZWRpYUVuZ2luZSk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0U6OmxvYWQpOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFOjp0cmFja0RldGVjdGVk KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRTo6c3Vw cG9ydHNUeXBlKToKKwogMjAxOC0xMS0wMSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUu Y29tPgogCiAgICAgICAgIFtXZWIgQW5pbWF0aW9uc10gTWFrZSBkb2N1bWVudC5nZXRBbmltYXRp b25zKCkgcmV0dXJuIGRlY2xhcmF0aXZlIGFuaW1hdGlvbnMgaW4gdGhlIGNvcnJlY3Qgb3JkZXIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9H U3RyZWFtZXJDb21tb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5jcHAKaW5kZXggNzcyM2QyOWNlNGE1NmE3ZWE2MmZlMjM5 YTY0NWRjZTRhZTczZDg2Yi4uNTI2NDliYmE3YWI4YzRkOWFiNzUzOWFlMzI5OTY0ODM4MzgxZmM5 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L0dTdHJlYW1lckNvbW1vbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5jcHAKQEAgLTM4LDYgKzM4LDIyIEBACiAjdW5k ZWYgR1NUX1VTRV9VTlNUQUJMRV9BUEkKICNlbmRpZgogCisjaWYgRU5BQkxFKE1FRElBX1NPVVJD RSkKKyNpbmNsdWRlICJXZWJLaXRNZWRpYVNvdXJjZUdTdHJlYW1lci5oIgorI2VuZGlmCisKKyNp ZiBFTkFCTEUoTUVESUFfU1RSRUFNKSAmJiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAxMCwgMCkKKyNp bmNsdWRlICJHU3RyZWFtZXJNZWRpYVN0cmVhbVNvdXJjZS5oIgorI2VuZGlmCisKKyNpZiBFTkFC TEUoRU5DUllQVEVEX01FRElBKQorI2luY2x1ZGUgIldlYktpdENsZWFyS2V5RGVjcnlwdG9yR1N0 cmVhbWVyLmgiCisjZW5kaWYKKworI2lmIEVOQUJMRShWSURFTykKKyNpbmNsdWRlICJXZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuaCIKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIEdz dFBhZCogd2Via2l0R3N0R2hvc3RQYWRGcm9tU3RhdGljVGVtcGxhdGUoR3N0U3RhdGljUGFkVGVt cGxhdGUqIHN0YXRpY1BhZFRlbXBsYXRlLCBjb25zdCBnY2hhciogbmFtZSwgR3N0UGFkKiB0YXJn ZXQpCkBAIC0yMzQsNiArMjUwLDM0IEBAIGJvb2wgaW5pdGlhbGl6ZUdTdHJlYW1lcihzdGQ6Om9w dGlvbmFsPFZlY3RvcjxTdHJpbmc+PiYmIG9wdGlvbnMpCiAgICAgcmV0dXJuIGlzR1N0cmVhbWVy SW5pdGlhbGl6ZWQ7CiB9CiAKK2Jvb2wgaW5pdGlhbGl6ZUdTdHJlYW1lckFuZFJlZ2lzdGVyV2Vi S2l0RWxlbWVudHMoKQoreworICAgIGlmICghaW5pdGlhbGl6ZUdTdHJlYW1lcigpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcgb25jZUZsYWc7Cisg ICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFtdIHsKKyNpZiBFTkFCTEUoRU5DUllQVEVEX01F RElBKQorICAgICAgICBpZiAod2Via2l0R3N0Q2hlY2tWZXJzaW9uKDEsIDYsIDEpKQorICAgICAg ICAgICAgZ3N0X2VsZW1lbnRfcmVnaXN0ZXIobnVsbHB0ciwgIndlYmtpdGNsZWFya2V5IiwgR1NU X1JBTktfUFJJTUFSWSArIDEwMCwgV0VCS0lUX1RZUEVfTUVESUFfQ0tfREVDUllQVCk7CisjZW5k aWYKKworI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pICYmIEdTVF9DSEVDS19WRVJTSU9OKDEsIDEw LCAwKQorICAgICAgICBpZiAod2Via2l0R3N0Q2hlY2tWZXJzaW9uKDEsIDEwLCAwKSkKKyAgICAg ICAgICAgIGdzdF9lbGVtZW50X3JlZ2lzdGVyKG51bGxwdHIsICJtZWRpYXN0cmVhbXNyYyIsIEdT VF9SQU5LX1BSSU1BUlksIFdFQktJVF9UWVBFX01FRElBX1NUUkVBTV9TUkMpOworI2VuZGlmCisK KyNpZiBFTkFCTEUoTUVESUFfU09VUkNFKQorICAgICAgICBnc3RfZWxlbWVudF9yZWdpc3Rlcihu dWxscHRyLCAid2Via2l0bWVkaWFzcmMiLCBHU1RfUkFOS19QUklNQVJZICsgMTAwLCBXRUJLSVRf VFlQRV9NRURJQV9TUkMpOworI2VuZGlmCisKKyNpZiBFTkFCTEUoVklERU8pCisgICAgICAgIGdz dF9lbGVtZW50X3JlZ2lzdGVyKDAsICJ3ZWJraXR3ZWJzcmMiLCBHU1RfUkFOS19QUklNQVJZICsg MTAwLCBXRUJLSVRfVFlQRV9XRUJfU1JDKTsKKyNlbmRpZgorICAgIH0pOworICAgIHJldHVybiB0 cnVlOworfQorCiB1bnNpZ25lZCBnZXRHc3RQbGF5RmxhZyhjb25zdCBjaGFyKiBuaWNrKQogewog ICAgIHN0YXRpYyBHRmxhZ3NDbGFzcyogZmxhZ3NDbGFzcyA9IHN0YXRpY19jYXN0PEdGbGFnc0Ns YXNzKj4oZ190eXBlX2NsYXNzX3JlZihnX3R5cGVfZnJvbV9uYW1lKCJHc3RQbGF5RmxhZ3MiKSkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L0dTdHJlYW1lckNvbW1vbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oCmluZGV4IGY1Yzk5NjU0NTIyYzc4M2ZkMzg1NWJjZDEz ZDg3ZWMzMWYzODRjMDQuLjExMGI2ZWUzYjkzYzNjNWRhOGY1OTZjZDA5YTBkODQ1ZDFkMmUwNGEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9H U3RyZWFtZXJDb21tb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmgKQEAgLTY4LDYgKzY4LDcgQEAgYm9vbCBkb0NhcHNI YXZlVHlwZShjb25zdCBHc3RDYXBzKiwgY29uc3QgY2hhciopOwogYm9vbCBhcmVFbmNyeXB0ZWRD YXBzKGNvbnN0IEdzdENhcHMqKTsKIFZlY3RvcjxTdHJpbmc+IGV4dHJhY3RHU3RyZWFtZXJPcHRp b25zRnJvbUNvbW1hbmRMaW5lKCk7CiBib29sIGluaXRpYWxpemVHU3RyZWFtZXIoc3RkOjpvcHRp b25hbDxWZWN0b3I8U3RyaW5nPj4mJiA9IHN0ZDo6bnVsbG9wdCk7Citib29sIGluaXRpYWxpemVH U3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCk7CiB1bnNpZ25lZCBnZXRHc3RQbGF5 RmxhZyhjb25zdCBjaGFyKiBuaWNrKTsKIHVpbnQ2NF90IHRvR3N0VW5zaWduZWQ2NFRpbWUoY29u c3QgTWVkaWFUaW1lJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAKaW5kZXggMTE1NzBkZGMwZDk4NzQ3MmRkNmE4ZDczYTdlMWRkYWEwOTJmNjIy Zi4uZmNhOTJlZDlmZTc4YzBiNDkxMThiZWNlNzI4YjFmZGIwMDM3MmQzOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTgxLDcgKzgxLDcg QEAKICNpbmNsdWRlICJBdWRpb1NvdXJjZVByb3ZpZGVyR1N0cmVhbWVyLmgiCiAjZW5kaWYKIAot R1NUX0RFQlVHX0NBVEVHT1JZX0VYVEVSTih3ZWJraXRfbWVkaWFfcGxheWVyX2RlYnVnKTsKK0dT VF9ERUJVR19DQVRFR09SWSh3ZWJraXRfbWVkaWFfcGxheWVyX2RlYnVnKTsKICNkZWZpbmUgR1NU X0NBVF9ERUZBVUxUIHdlYmtpdF9tZWRpYV9wbGF5ZXJfZGVidWcKIAogCkBAIC0xMjEsNyArMTIx LDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnJlZ2lzdGVyTWVkaWFFbmdp bmUoTWVkaWFFbmdpbmVSZWdpc3RyYXIgcmVnaXMKIAogYm9vbCBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OmlzQXZhaWxhYmxlKCkKIHsKLSAgICBpZiAoIU1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2U6OmluaXRpYWxpemVHU3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRz KCkpCisgICAgR1NUX0RFQlVHX0NBVEVHT1JZX0lOSVQod2Via2l0X21lZGlhX3BsYXllcl9kZWJ1 ZywgIndlYmtpdG1lZGlhcGxheWVyIiwgMCwgIldlYktpdCBtZWRpYSBwbGF5ZXIiKTsKKyAgICBp ZiAoIWluaXRpYWxpemVHU3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAogICAgIEdSZWZQdHI8R3N0RWxlbWVudEZhY3Rvcnk+IGZhY3Rv cnkgPSBhZG9wdEdSZWYoZ3N0X2VsZW1lbnRfZmFjdG9yeV9maW5kKCJwbGF5YmluIikpOwpAQCAt MjU4LDkgKzI1OSw2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkRnVs bChjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29uc3QgZ2NoYXIqCiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKLSAgICBpZiAoIU1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmluaXRp YWxpemVHU3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCkpCi0gICAgICAgIHJldHVy bjsKLQogICAgIFVSTCB1cmwoVVJMKCksIHVybFN0cmluZyk7CiAgICAgaWYgKHVybC5wcm90b2Nv bElzQWJvdXQoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjIxNCw3ICsyMjEyLDcgQEAgc3RhdGlj IEhhc2hTZXQ8U3RyaW5nLCBBU0NJSUNhc2VJbnNlbnNpdGl2ZUhhc2g+JiBtaW1lVHlwZVNldCgp CiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8U3RyaW5nLCBBU0NJSUNhc2VJ bnNlbnNpdGl2ZUhhc2g+PiBtaW1lVHlwZXMgPSBbXSgpCiAgICAgewotICAgICAgICBNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjppbml0aWFsaXplR1N0cmVhbWVyQW5kUmVnaXN0ZXJX ZWJLaXRFbGVtZW50cygpOworICAgICAgICBpbml0aWFsaXplR1N0cmVhbWVyQW5kUmVnaXN0ZXJX ZWJLaXRFbGVtZW50cygpOwogICAgICAgICBIYXNoU2V0PFN0cmluZywgQVNDSUlDYXNlSW5zZW5z aXRpdmVIYXNoPiBzZXQ7CiAKICAgICAgICAgR0xpc3QqIGF1ZGlvRGVjb2RlckZhY3RvcmllcyA9 IGdzdF9lbGVtZW50X2ZhY3RvcnlfbGlzdF9nZXRfZWxlbWVudHMoR1NUX0VMRU1FTlRfRkFDVE9S WV9UWVBFX0RFQ09ERVIgfCBHU1RfRUxFTUVOVF9GQUNUT1JZX1RZUEVfTUVESUFfQVVESU8sIEdT VF9SQU5LX01BUkdJTkFMKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXJCYXNlLmNwcAppbmRleCAxYjllNGEyYzFiNmVkNDEyNWRmZWI5NzY1YzA1NGM2 ZDUwYThkNjRkLi42ZjcyNmI1MTQ4NTIyMTAyZGNiZmE1YTMzNWZmOWZkNmZiN2RlZWU4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3Bw CkBAIC0zNyw3ICszNyw2IEBACiAjaW5jbHVkZSAiTWVkaWFQbGF5ZXIuaCIKICNpbmNsdWRlICJO b3RJbXBsZW1lbnRlZC5oIgogI2luY2x1ZGUgIlZpZGVvU2lua0dTdHJlYW1lci5oIgotI2luY2x1 ZGUgIldlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5oIgogI2luY2x1ZGUgPHd0Zi9nbGliL0dVbmlx dWVQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9BdG9taWNTdHJpbmcuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC01MSwxNSArNTAsNiBAQAogI2luY2x1ZGUgIkNETUluc3Rh bmNlLmgiCiAjaW5jbHVkZSAiR1N0cmVhbWVyRU1FVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAiU2hh cmVkQnVmZmVyLmgiCi0jaW5jbHVkZSAiV2ViS2l0Q2xlYXJLZXlEZWNyeXB0b3JHU3RyZWFtZXIu aCIKLSNlbmRpZgotCi0jaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkKLSNpbmNsdWRlICJXZWJLaXRN ZWRpYVNvdXJjZUdTdHJlYW1lci5oIgotI2VuZGlmCi0KLSNpZiBFTkFCTEUoTUVESUFfU1RSRUFN KSAmJiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAxMCwgMCkKLSNpbmNsdWRlICJHU3RyZWFtZXJNZWRp YVN0cmVhbVNvdXJjZS5oIgogI2VuZGlmCiAKICNpZiBVU0UoR1NUUkVBTUVSX0dMKQpAQCAtMTM1 LDQwICsxMjUsMTMgQEAKICNlbmRpZgogI2VuZGlmIC8vIFVTRShURVhUVVJFX01BUFBFUl9HTCkK IAotR1NUX0RFQlVHX0NBVEVHT1JZKHdlYmtpdF9tZWRpYV9wbGF5ZXJfZGVidWcpOworR1NUX0RF QlVHX0NBVEVHT1JZX0VYVEVSTih3ZWJraXRfbWVkaWFfcGxheWVyX2RlYnVnKTsKICNkZWZpbmUg R1NUX0NBVF9ERUZBVUxUIHdlYmtpdF9tZWRpYV9wbGF5ZXJfZGVidWcKIAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCi1ib29sIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lckJhc2U6OmluaXRpYWxpemVHU3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1l bnRzKCkKLXsKLSAgICBpZiAoIWluaXRpYWxpemVHU3RyZWFtZXIoKSkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOwotICAgIHN0ZDo6 Y2FsbF9vbmNlKG9uY2VGbGFnLCBbXSB7Ci0gICAgICAgIEdTVF9ERUJVR19DQVRFR09SWV9JTklU KHdlYmtpdF9tZWRpYV9wbGF5ZXJfZGVidWcsICJ3ZWJraXRtZWRpYXBsYXllciIsIDAsICJXZWJL aXQgbWVkaWEgcGxheWVyIik7Ci0jaWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKLSAgICAgICAg aWYgKHdlYmtpdEdzdENoZWNrVmVyc2lvbigxLCA2LCAxKSkKLSAgICAgICAgICAgIGdzdF9lbGVt ZW50X3JlZ2lzdGVyKG51bGxwdHIsICJ3ZWJraXRjbGVhcmtleSIsIEdTVF9SQU5LX1BSSU1BUlkg KyAxMDAsIFdFQktJVF9UWVBFX01FRElBX0NLX0RFQ1JZUFQpOwotI2VuZGlmCi0KLSNpZiBFTkFC TEUoTUVESUFfU1RSRUFNKSAmJiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAxMCwgMCkKLSAgICAgICAg aWYgKHdlYmtpdEdzdENoZWNrVmVyc2lvbigxLCAxMCwgMCkpCi0gICAgICAgICAgICBnc3RfZWxl bWVudF9yZWdpc3RlcihudWxscHRyLCAibWVkaWFzdHJlYW1zcmMiLCBHU1RfUkFOS19QUklNQVJZ LCBXRUJLSVRfVFlQRV9NRURJQV9TVFJFQU1fU1JDKTsKLSNlbmRpZgotCi0jaWYgRU5BQkxFKE1F RElBX1NPVVJDRSkKLSAgICAgICAgZ3N0X2VsZW1lbnRfcmVnaXN0ZXIobnVsbHB0ciwgIndlYmtp dG1lZGlhc3JjIiwgR1NUX1JBTktfUFJJTUFSWSArIDEwMCwgV0VCS0lUX1RZUEVfTUVESUFfU1JD KTsKLSNlbmRpZgotCi0gICAgICAgIGdzdF9lbGVtZW50X3JlZ2lzdGVyKDAsICJ3ZWJraXR3ZWJz cmMiLCBHU1RfUkFOS19QUklNQVJZICsgMTAwLCBXRUJLSVRfVFlQRV9XRUJfU1JDKTsKLSAgICB9 KTsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQogc3RhdGljIGludCBncmVhdGVzdENvbW1vbkRpdmlz b3IoaW50IGEsIGludCBiKQogewogICAgIHdoaWxlIChiKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaAppbmRleCA0ZmExNTVhODMzN2M3OWUy MjdiNThlZGVhZmZmZjNmOGMyYjQxMzUzLi5lZTc2NzA5MzI5NmI2ZTJiNjY5YTNlMzE0YzQzZjA1 ZjdjYzFmOGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlLmgKQEAgLTg3LDcgKzg3LDYgQEAgcHVibGljOgogICAgIGJvb2wgZW5zdXJlR3N0 R0xDb250ZXh0KCk7CiAgICAgR3N0Q29udGV4dCogcmVxdWVzdEdMQ29udGV4dChjb25zdCBjaGFy KiBjb250ZXh0VHlwZSk7CiAjZW5kaWYKLSAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplR1N0cmVh bWVyQW5kUmVnaXN0ZXJXZWJLaXRFbGVtZW50cygpOwogICAgIGJvb2wgc3VwcG9ydHNNdXRpbmco KSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAgICAgdm9pZCBzZXRNdXRlZChib29s KSBvdmVycmlkZTsKICAgICBib29sIG11dGVkKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lck1TRS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvbXNlL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRS5jcHAKaW5kZXggNGYxZjhh YjAzOGI3ODMzYmVhZTI4OTBhMmNhZTQ1NTk4ZGZiMmE3Ni4uMmNjM2QxYTdlMDkwNjY5ZGMzNzNj YzUyNDgzOGMzNGZiNTU4NmY3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFLmNwcApAQCAtNzksNiArNzksNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFOjpyZWdp c3Rlck1lZGlhRW5naW5lKE1lZGlhRW5naW5lUmVnaXN0cmFyIHJlZ2lzdHJhcikKIHsKKyAgICBp bml0aWFsaXplR1N0cmVhbWVyQW5kUmVnaXN0ZXJXZWJLaXRFbGVtZW50cygpOwogICAgIEdTVF9E RUJVR19DQVRFR09SWV9JTklUKHdlYmtpdF9tc2VfZGVidWcsICJ3ZWJraXRtc2UiLCAwLCAiV2Vi S2l0IE1TRSBtZWRpYSBwbGF5ZXIiKTsKICAgICBpZiAoaXNBdmFpbGFibGUoKSkgewogICAgICAg ICByZWdpc3RyYXIoW10oTWVkaWFQbGF5ZXIqIHBsYXllcikgeyByZXR1cm4gc3RkOjptYWtlX3Vu aXF1ZTxNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0U+KHBsYXllcik7IH0sCkBAIC0xMTcs MTAgKzExOCw2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFOjpsb2FkKGNv bnN0IFN0cmluZyYgdXJsU3RyaW5nKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0KLSAgICBp ZiAoVU5MSUtFTFkoIU1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmluaXRpYWxpemVH U3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCkpKQotICAgICAgICByZXR1cm47Ci0K ICAgICBpZiAoIW1fcGxheWJhY2tQaXBlbGluZSkKICAgICAgICAgbV9wbGF5YmFja1BpcGVsaW5l ID0gUGxheWJhY2tQaXBlbGluZTo6Y3JlYXRlKCk7CiAKQEAgLTY4OSw3ICs2ODYsNyBAQCBzdGF0 aWMgSGFzaFNldDxTdHJpbmcsIEFTQ0lJQ2FzZUluc2Vuc2l0aXZlSGFzaD4mIG1pbWVUeXBlQ2Fj aGUoKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNoU2V0PFN0cmluZywgQVNDSUlD YXNlSW5zZW5zaXRpdmVIYXNoPj4gY2FjaGUgPSBbXSgpCiAgICAgewotICAgICAgICBNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjppbml0aWFsaXplR1N0cmVhbWVyQW5kUmVnaXN0ZXJX ZWJLaXRFbGVtZW50cygpOworICAgICAgICBpbml0aWFsaXplR1N0cmVhbWVyQW5kUmVnaXN0ZXJX ZWJLaXRFbGVtZW50cygpOwogICAgICAgICBIYXNoU2V0PFN0cmluZywgQVNDSUlDYXNlSW5zZW5z aXRpdmVIYXNoPiBzZXQ7CiAgICAgICAgIGNvbnN0IGNoYXIqIG1pbWVUeXBlc1tdID0gewogICAg ICAgICAgICAgInZpZGVvL21wNCIsCkBAIC03MzMsNyArNzMwLDcgQEAgY29uc3Qgc3RhdGljIEhh c2hTZXQ8QXRvbWljU3RyaW5nPiYgY29kZWNTZXQoKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ry b3llZDxIYXNoU2V0PEF0b21pY1N0cmluZz4+IGNvZGVjVHlwZXMgPSBbXSgpCiAgICAgewotICAg ICAgICBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjppbml0aWFsaXplR1N0cmVhbWVy QW5kUmVnaXN0ZXJXZWJLaXRFbGVtZW50cygpOworICAgICAgICBpbml0aWFsaXplR1N0cmVhbWVy QW5kUmVnaXN0ZXJXZWJLaXRFbGVtZW50cygpOwogICAgICAgICBIYXNoU2V0PEF0b21pY1N0cmlu Zz4gc2V0OwogCiAgICAgICAgIEdMaXN0KiBhdWRpb0RlY29kZXJGYWN0b3JpZXMgPSBnc3RfZWxl bWVudF9mYWN0b3J5X2xpc3RfZ2V0X2VsZW1lbnRzKEdTVF9FTEVNRU5UX0ZBQ1RPUllfVFlQRV9E RUNPREVSIHwgR1NUX0VMRU1FTlRfRkFDVE9SWV9UWVBFX01FRElBX0FVRElPLCBHU1RfUkFOS19N QVJHSU5BTCk7Cg== 353712 2018-11-02 10:40:46 -0700 2018-11-04 23:34:06 -0800 Patch bug-191189-20181102174044.patch text/plain 12555 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3NzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTIzY2MyZDM1NWI2Y2E2 NzNkNTk5OWFkYjkyZWRmOTAyMDExNzNmZC4uYzAyNWRlYjkxZWNlNGI1YjZlMWFlOWFhMjM5YTgy Y2ZiN2QzZDNhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE4LTExLTAyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBNb3ZlIGVsZW1lbnRzIHJlZ2lzdHJhdGlvbiB0byBHU3RyZWFtZXJDb21tb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTE4OQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IHdhcyBhIGJpdCBvZGQg dG8gaGF2ZSB0aGlzIGluIHRoZSBiYXNlIHBsYXllciBjbGFzcyBhbmQgdG8gaGF2ZQorICAgICAg ICBzdWItY2xhc3NlcyBjYWxsaW5nIGEgc3RhdGljIGZ1bmN0aW9uIG9mIHRoZSBzdXBlci1jbGFz cy4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjppbml0aWFsaXplR1N0cmVhbWVyQW5kUmVnaXN0ZXJXZWJLaXRFbGVtZW50cyk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjppc0F2YWlsYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OmxvYWRGdWxsKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6Z2V0U3VwcG9ydGVkVHlwZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRTo6cmVnaXN0ZXJNZWRpYUVuZ2luZSk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0U6OmxvYWQpOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFOjp0cmFja0RldGVjdGVk KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRTo6c3Vw cG9ydHNUeXBlKToKKwogMjAxOC0xMS0wMiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgog CiAgICAgICAgIFJlbW92ZSBFTkFCTEVfT1BFTkNMIGZ1bGx5CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21t b24uY3BwCmluZGV4IDc3MjNkMjljZTRhNTZhN2VhNjJmZTIzOWE2NDVkY2U0YWU3M2Q4NmIuLjUy NjQ5YmJhN2FiOGM0ZDlhYjc1MzlhZTMyOTk2NDgzODM4MWZjOTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFt ZXJDb21tb24uY3BwCkBAIC0zOCw2ICszOCwyMiBAQAogI3VuZGVmIEdTVF9VU0VfVU5TVEFCTEVf QVBJCiAjZW5kaWYKIAorI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpCisjaW5jbHVkZSAiV2ViS2l0 TWVkaWFTb3VyY2VHU3RyZWFtZXIuaCIKKyNlbmRpZgorCisjaWYgRU5BQkxFKE1FRElBX1NUUkVB TSkgJiYgR1NUX0NIRUNLX1ZFUlNJT04oMSwgMTAsIDApCisjaW5jbHVkZSAiR1N0cmVhbWVyTWVk aWFTdHJlYW1Tb3VyY2UuaCIKKyNlbmRpZgorCisjaWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkK KyNpbmNsdWRlICJXZWJLaXRDbGVhcktleURlY3J5cHRvckdTdHJlYW1lci5oIgorI2VuZGlmCisK KyNpZiBFTkFCTEUoVklERU8pCisjaW5jbHVkZSAiV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmgi CisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBHc3RQYWQqIHdlYmtpdEdzdEdob3N0 UGFkRnJvbVN0YXRpY1RlbXBsYXRlKEdzdFN0YXRpY1BhZFRlbXBsYXRlKiBzdGF0aWNQYWRUZW1w bGF0ZSwgY29uc3QgZ2NoYXIqIG5hbWUsIEdzdFBhZCogdGFyZ2V0KQpAQCAtMjM0LDYgKzI1MCwz NCBAQCBib29sIGluaXRpYWxpemVHU3RyZWFtZXIoc3RkOjpvcHRpb25hbDxWZWN0b3I8U3RyaW5n Pj4mJiBvcHRpb25zKQogICAgIHJldHVybiBpc0dTdHJlYW1lckluaXRpYWxpemVkOwogfQogCiti b29sIGluaXRpYWxpemVHU3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCkKK3sKKyAg ICBpZiAoIWluaXRpYWxpemVHU3RyZWFtZXIoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisg ICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOworICAgIHN0ZDo6Y2FsbF9vbmNlKG9u Y2VGbGFnLCBbXSB7CisjaWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKKyAgICAgICAgaWYgKHdl YmtpdEdzdENoZWNrVmVyc2lvbigxLCA2LCAxKSkKKyAgICAgICAgICAgIGdzdF9lbGVtZW50X3Jl Z2lzdGVyKG51bGxwdHIsICJ3ZWJraXRjbGVhcmtleSIsIEdTVF9SQU5LX1BSSU1BUlkgKyAxMDAs IFdFQktJVF9UWVBFX01FRElBX0NLX0RFQ1JZUFQpOworI2VuZGlmCisKKyNpZiBFTkFCTEUoTUVE SUFfU1RSRUFNKSAmJiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAxMCwgMCkKKyAgICAgICAgaWYgKHdl YmtpdEdzdENoZWNrVmVyc2lvbigxLCAxMCwgMCkpCisgICAgICAgICAgICBnc3RfZWxlbWVudF9y ZWdpc3RlcihudWxscHRyLCAibWVkaWFzdHJlYW1zcmMiLCBHU1RfUkFOS19QUklNQVJZLCBXRUJL SVRfVFlQRV9NRURJQV9TVFJFQU1fU1JDKTsKKyNlbmRpZgorCisjaWYgRU5BQkxFKE1FRElBX1NP VVJDRSkKKyAgICAgICAgZ3N0X2VsZW1lbnRfcmVnaXN0ZXIobnVsbHB0ciwgIndlYmtpdG1lZGlh c3JjIiwgR1NUX1JBTktfUFJJTUFSWSArIDEwMCwgV0VCS0lUX1RZUEVfTUVESUFfU1JDKTsKKyNl bmRpZgorCisjaWYgRU5BQkxFKFZJREVPKQorICAgICAgICBnc3RfZWxlbWVudF9yZWdpc3Rlcigw LCAid2Via2l0d2Vic3JjIiwgR1NUX1JBTktfUFJJTUFSWSArIDEwMCwgV0VCS0lUX1RZUEVfV0VC X1NSQyk7CisjZW5kaWYKKyAgICB9KTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogdW5zaWduZWQg Z2V0R3N0UGxheUZsYWcoY29uc3QgY2hhciogbmljaykKIHsKICAgICBzdGF0aWMgR0ZsYWdzQ2xh c3MqIGZsYWdzQ2xhc3MgPSBzdGF0aWNfY2FzdDxHRmxhZ3NDbGFzcyo+KGdfdHlwZV9jbGFzc19y ZWYoZ190eXBlX2Zyb21fbmFtZSgiR3N0UGxheUZsYWdzIikpKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21t b24uaAppbmRleCBmNWM5OTY1NDUyMmM3ODNmZDM4NTViY2QxM2Q4N2VjMzFmMzg0YzA0Li4xMTBi NmVlM2I5M2MzYzVkYThmNTk2Y2QwOWEwZDg0NWQxZDJlMDRhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNv bW1vbi5oCkBAIC02OCw2ICs2OCw3IEBAIGJvb2wgZG9DYXBzSGF2ZVR5cGUoY29uc3QgR3N0Q2Fw cyosIGNvbnN0IGNoYXIqKTsKIGJvb2wgYXJlRW5jcnlwdGVkQ2Fwcyhjb25zdCBHc3RDYXBzKik7 CiBWZWN0b3I8U3RyaW5nPiBleHRyYWN0R1N0cmVhbWVyT3B0aW9uc0Zyb21Db21tYW5kTGluZSgp OwogYm9vbCBpbml0aWFsaXplR1N0cmVhbWVyKHN0ZDo6b3B0aW9uYWw8VmVjdG9yPFN0cmluZz4+ JiYgPSBzdGQ6Om51bGxvcHQpOworYm9vbCBpbml0aWFsaXplR1N0cmVhbWVyQW5kUmVnaXN0ZXJX ZWJLaXRFbGVtZW50cygpOwogdW5zaWduZWQgZ2V0R3N0UGxheUZsYWcoY29uc3QgY2hhciogbmlj ayk7CiB1aW50NjRfdCB0b0dzdFVuc2lnbmVkNjRUaW1lKGNvbnN0IE1lZGlhVGltZSYpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IDEx NTcwZGRjMGQ5ODc0NzJkZDZhOGQ3M2E3ZTFkZGFhMDkyZjYyMmYuLjA3NDA5NmQwMTg5OWY4ZjA5 MWFmMjFkNGEzYjc3YjU4ZjI5MDM1NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0xMTMsNiArMTEzLDcgQEAgdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnNldEF1ZGlvU3RyZWFtUHJvcGVydGllcyhHT2JqZWN0KiBvYmpl Y3QpCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpyZWdpc3Rlck1lZGlhRW5n aW5lKE1lZGlhRW5naW5lUmVnaXN0cmFyIHJlZ2lzdHJhcikKIHsKKyAgICBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJCYXNlOjppbml0aWFsaXplRGVidWdDYXRlZ29yeSgpOwogICAgIGlmIChp c0F2YWlsYWJsZSgpKSB7CiAgICAgICAgIHJlZ2lzdHJhcihbXShNZWRpYVBsYXllciogcGxheWVy KSB7IHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcj4o cGxheWVyKTsgfSwKICAgICAgICAgICAgIGdldFN1cHBvcnRlZFR5cGVzLCBzdXBwb3J0c1R5cGUs IG51bGxwdHIsIG51bGxwdHIsIG51bGxwdHIsIHN1cHBvcnRzS2V5U3lzdGVtKTsKQEAgLTEyMSw3 ICsxMjIsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cmVnaXN0ZXJNZWRp YUVuZ2luZShNZWRpYUVuZ2luZVJlZ2lzdHJhciByZWdpcwogCiBib29sIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6aXNBdmFpbGFibGUoKQogewotICAgIGlmICghTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyQmFzZTo6aW5pdGlhbGl6ZUdTdHJlYW1lckFuZFJlZ2lzdGVyV2ViS2l0RWxl bWVudHMoKSkKKyAgICBpZiAoIWluaXRpYWxpemVHU3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVs ZW1lbnRzKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIEdSZWZQdHI8R3N0RWxlbWVu dEZhY3Rvcnk+IGZhY3RvcnkgPSBhZG9wdEdSZWYoZ3N0X2VsZW1lbnRfZmFjdG9yeV9maW5kKCJw bGF5YmluIikpOwpAQCAtMjU4LDkgKzI1OSw2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyOjpsb2FkRnVsbChjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29uc3QgZ2NoYXIqCiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoIU1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lckJhc2U6OmluaXRpYWxpemVHU3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCkp Ci0gICAgICAgIHJldHVybjsKLQogICAgIFVSTCB1cmwoVVJMKCksIHVybFN0cmluZyk7CiAgICAg aWYgKHVybC5wcm90b2NvbElzQWJvdXQoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjIxNCw3ICsy MjEyLDcgQEAgc3RhdGljIEhhc2hTZXQ8U3RyaW5nLCBBU0NJSUNhc2VJbnNlbnNpdGl2ZUhhc2g+ JiBtaW1lVHlwZVNldCgpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8U3Ry aW5nLCBBU0NJSUNhc2VJbnNlbnNpdGl2ZUhhc2g+PiBtaW1lVHlwZXMgPSBbXSgpCiAgICAgewot ICAgICAgICBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjppbml0aWFsaXplR1N0cmVh bWVyQW5kUmVnaXN0ZXJXZWJLaXRFbGVtZW50cygpOworICAgICAgICBpbml0aWFsaXplR1N0cmVh bWVyQW5kUmVnaXN0ZXJXZWJLaXRFbGVtZW50cygpOwogICAgICAgICBIYXNoU2V0PFN0cmluZywg QVNDSUlDYXNlSW5zZW5zaXRpdmVIYXNoPiBzZXQ7CiAKICAgICAgICAgR0xpc3QqIGF1ZGlvRGVj b2RlckZhY3RvcmllcyA9IGdzdF9lbGVtZW50X2ZhY3RvcnlfbGlzdF9nZXRfZWxlbWVudHMoR1NU X0VMRU1FTlRfRkFDVE9SWV9UWVBFX0RFQ09ERVIgfCBHU1RfRUxFTUVOVF9GQUNUT1JZX1RZUEVf TUVESUFfQVVESU8sIEdTVF9SQU5LX01BUkdJTkFMKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAppbmRleCAxYjllNGEyYzFiNmVkNDEy NWRmZWI5NzY1YzA1NGM2ZDUwYThkNjRkLi4wN2QyOTc3N2ZiMjQ2NzQ5NGUwMTc4ZWIzZjRkMmYy YTg4ZjgzMTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2UuY3BwCkBAIC0zNyw3ICszNyw2IEBACiAjaW5jbHVkZSAiTWVkaWFQbGF5ZXIu aCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgogI2luY2x1ZGUgIlZpZGVvU2lua0dTdHJl YW1lci5oIgotI2luY2x1ZGUgIldlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5oIgogI2luY2x1ZGUg PHd0Zi9nbGliL0dVbmlxdWVQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9BdG9taWNTdHJpbmcu aD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC01MSwxNSArNTAsNiBAQAogI2lu Y2x1ZGUgIkNETUluc3RhbmNlLmgiCiAjaW5jbHVkZSAiR1N0cmVhbWVyRU1FVXRpbGl0aWVzLmgi CiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCi0jaW5jbHVkZSAiV2ViS2l0Q2xlYXJLZXlEZWNy eXB0b3JHU3RyZWFtZXIuaCIKLSNlbmRpZgotCi0jaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkKLSNp bmNsdWRlICJXZWJLaXRNZWRpYVNvdXJjZUdTdHJlYW1lci5oIgotI2VuZGlmCi0KLSNpZiBFTkFC TEUoTUVESUFfU1RSRUFNKSAmJiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAxMCwgMCkKLSNpbmNsdWRl ICJHU3RyZWFtZXJNZWRpYVN0cmVhbVNvdXJjZS5oIgogI2VuZGlmCiAKICNpZiBVU0UoR1NUUkVB TUVSX0dMKQpAQCAtMTQyLDMzICsxMzIsNiBAQCBHU1RfREVCVUdfQ0FURUdPUlkod2Via2l0X21l ZGlhX3BsYXllcl9kZWJ1Zyk7CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiB1c2luZyBuYW1lc3BhY2Ug c3RkOwogCi1ib29sIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmluaXRpYWxpemVH U3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCkKLXsKLSAgICBpZiAoIWluaXRpYWxp emVHU3RyZWFtZXIoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgc3RhdGljIHN0ZDo6 b25jZV9mbGFnIG9uY2VGbGFnOwotICAgIHN0ZDo6Y2FsbF9vbmNlKG9uY2VGbGFnLCBbXSB7Ci0g ICAgICAgIEdTVF9ERUJVR19DQVRFR09SWV9JTklUKHdlYmtpdF9tZWRpYV9wbGF5ZXJfZGVidWcs ICJ3ZWJraXRtZWRpYXBsYXllciIsIDAsICJXZWJLaXQgbWVkaWEgcGxheWVyIik7Ci0jaWYgRU5B QkxFKEVOQ1JZUFRFRF9NRURJQSkKLSAgICAgICAgaWYgKHdlYmtpdEdzdENoZWNrVmVyc2lvbigx LCA2LCAxKSkKLSAgICAgICAgICAgIGdzdF9lbGVtZW50X3JlZ2lzdGVyKG51bGxwdHIsICJ3ZWJr aXRjbGVhcmtleSIsIEdTVF9SQU5LX1BSSU1BUlkgKyAxMDAsIFdFQktJVF9UWVBFX01FRElBX0NL X0RFQ1JZUFQpOwotI2VuZGlmCi0KLSNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKSAmJiBHU1RfQ0hF Q0tfVkVSU0lPTigxLCAxMCwgMCkKLSAgICAgICAgaWYgKHdlYmtpdEdzdENoZWNrVmVyc2lvbigx LCAxMCwgMCkpCi0gICAgICAgICAgICBnc3RfZWxlbWVudF9yZWdpc3RlcihudWxscHRyLCAibWVk aWFzdHJlYW1zcmMiLCBHU1RfUkFOS19QUklNQVJZLCBXRUJLSVRfVFlQRV9NRURJQV9TVFJFQU1f U1JDKTsKLSNlbmRpZgotCi0jaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkKLSAgICAgICAgZ3N0X2Vs ZW1lbnRfcmVnaXN0ZXIobnVsbHB0ciwgIndlYmtpdG1lZGlhc3JjIiwgR1NUX1JBTktfUFJJTUFS WSArIDEwMCwgV0VCS0lUX1RZUEVfTUVESUFfU1JDKTsKLSNlbmRpZgotCi0gICAgICAgIGdzdF9l bGVtZW50X3JlZ2lzdGVyKDAsICJ3ZWJraXR3ZWJzcmMiLCBHU1RfUkFOS19QUklNQVJZICsgMTAw LCBXRUJLSVRfVFlQRV9XRUJfU1JDKTsKLSAgICB9KTsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQog c3RhdGljIGludCBncmVhdGVzdENvbW1vbkRpdmlzb3IoaW50IGEsIGludCBiKQogewogICAgIHdo aWxlIChiKSB7CkBAIC0yNzcsNiArMjQwLDExIEBAIHByaXZhdGU6CiB9OwogI2VuZGlmCiAKK3Zv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6aW5pdGlhbGl6ZURlYnVnQ2F0ZWdv cnkoKQoreworICAgIEdTVF9ERUJVR19DQVRFR09SWV9JTklUKHdlYmtpdF9tZWRpYV9wbGF5ZXJf ZGVidWcsICJ3ZWJraXRtZWRpYXBsYXllciIsIDAsICJXZWJLaXQgbWVkaWEgcGxheWVyIik7Cit9 CisKIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Ok1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2UoTWVkaWFQbGF5ZXIqIHBsYXllcikKICAgICA6IG1fbm90aWZpZXIoTWFpblRo cmVhZE5vdGlmaWVyPE1haW5UaHJlYWROb3RpZmljYXRpb24+OjpjcmVhdGUoKSkKICAgICAsIG1f cGxheWVyKHBsYXllcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZS5oCmluZGV4IDRmYTE1NWE4MzM3Yzc5ZTIyN2I1OGVkZWFmZmZmM2Y4YzJiNDEz NTMuLjcyNjdhZjE4Y2U2NDQ3MTgzZDk3MmRlNTgzMDQ3OTQxOWY3ODRjMjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaApAQCAtNzYsNiAr NzYsOCBAQCBjbGFzcyBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlIDogcHVibGljIE1l ZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZSwgcHVibAogewogCiBwdWJsaWM6CisgICAgc3RhdGlj IHZvaWQgaW5pdGlhbGl6ZURlYnVnQ2F0ZWdvcnkoKTsKKwogICAgIHZpcnR1YWwgfk1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UoKTsKIAogICAgIEZsb2F0U2l6ZSBuYXR1cmFsU2l6ZSgp IGNvbnN0IG92ZXJyaWRlOwpAQCAtODcsNyArODksNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBlbnN1 cmVHc3RHTENvbnRleHQoKTsKICAgICBHc3RDb250ZXh0KiByZXF1ZXN0R0xDb250ZXh0KGNvbnN0 IGNoYXIqIGNvbnRleHRUeXBlKTsKICNlbmRpZgotICAgIHN0YXRpYyBib29sIGluaXRpYWxpemVH U3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCk7CiAgICAgYm9vbCBzdXBwb3J0c011 dGluZygpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0KICAgICB2b2lkIHNldE11dGVk KGJvb2wpIG92ZXJyaWRlOwogICAgIGJvb2wgbXV0ZWQoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyTVNFLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9tc2UvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFLmNwcAppbmRleCA0 ZjFmOGFiMDM4Yjc4MzNiZWFlMjg5MGEyY2FlNDU1OThkZmIyYTc2Li4yY2MzZDFhN2UwOTA2Njlk YzM3M2NjNTI0ODM4YzM0ZmI1NTg2ZjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1T RS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21z ZS9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0UuY3BwCkBAIC03OSw2ICs3OSw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0U6 OnJlZ2lzdGVyTWVkaWFFbmdpbmUoTWVkaWFFbmdpbmVSZWdpc3RyYXIgcmVnaXN0cmFyKQogewor ICAgIGluaXRpYWxpemVHU3RyZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCk7CiAgICAg R1NUX0RFQlVHX0NBVEVHT1JZX0lOSVQod2Via2l0X21zZV9kZWJ1ZywgIndlYmtpdG1zZSIsIDAs ICJXZWJLaXQgTVNFIG1lZGlhIHBsYXllciIpOwogICAgIGlmIChpc0F2YWlsYWJsZSgpKSB7CiAg ICAgICAgIHJlZ2lzdHJhcihbXShNZWRpYVBsYXllciogcGxheWVyKSB7IHJldHVybiBzdGQ6Om1h a2VfdW5pcXVlPE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRT4ocGxheWVyKTsgfSwKQEAg LTExNywxMCArMTE4LDYgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0U6Omxv YWQoY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLQot ICAgIGlmIChVTkxJS0VMWSghTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6aW5pdGlh bGl6ZUdTdHJlYW1lckFuZFJlZ2lzdGVyV2ViS2l0RWxlbWVudHMoKSkpCi0gICAgICAgIHJldHVy bjsKLQogICAgIGlmICghbV9wbGF5YmFja1BpcGVsaW5lKQogICAgICAgICBtX3BsYXliYWNrUGlw ZWxpbmUgPSBQbGF5YmFja1BpcGVsaW5lOjpjcmVhdGUoKTsKIApAQCAtNjg5LDcgKzY4Niw3IEBA IHN0YXRpYyBIYXNoU2V0PFN0cmluZywgQVNDSUlDYXNlSW5zZW5zaXRpdmVIYXNoPiYgbWltZVR5 cGVDYWNoZSgpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8U3RyaW5nLCBB U0NJSUNhc2VJbnNlbnNpdGl2ZUhhc2g+PiBjYWNoZSA9IFtdKCkKICAgICB7Ci0gICAgICAgIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmluaXRpYWxpemVHU3RyZWFtZXJBbmRSZWdp c3RlcldlYktpdEVsZW1lbnRzKCk7CisgICAgICAgIGluaXRpYWxpemVHU3RyZWFtZXJBbmRSZWdp c3RlcldlYktpdEVsZW1lbnRzKCk7CiAgICAgICAgIEhhc2hTZXQ8U3RyaW5nLCBBU0NJSUNhc2VJ bnNlbnNpdGl2ZUhhc2g+IHNldDsKICAgICAgICAgY29uc3QgY2hhciogbWltZVR5cGVzW10gPSB7 CiAgICAgICAgICAgICAidmlkZW8vbXA0IiwKQEAgLTczMyw3ICs3MzAsNyBAQCBjb25zdCBzdGF0 aWMgSGFzaFNldDxBdG9taWNTdHJpbmc+JiBjb2RlY1NldCgpCiB7CiAgICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPEhhc2hTZXQ8QXRvbWljU3RyaW5nPj4gY29kZWNUeXBlcyA9IFtdKCkKICAgICB7 Ci0gICAgICAgIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmluaXRpYWxpemVHU3Ry ZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCk7CisgICAgICAgIGluaXRpYWxpemVHU3Ry ZWFtZXJBbmRSZWdpc3RlcldlYktpdEVsZW1lbnRzKCk7CiAgICAgICAgIEhhc2hTZXQ8QXRvbWlj U3RyaW5nPiBzZXQ7CiAKICAgICAgICAgR0xpc3QqIGF1ZGlvRGVjb2RlckZhY3RvcmllcyA9IGdz dF9lbGVtZW50X2ZhY3RvcnlfbGlzdF9nZXRfZWxlbWVudHMoR1NUX0VMRU1FTlRfRkFDVE9SWV9U WVBFX0RFQ09ERVIgfCBHU1RfRUxFTUVOVF9GQUNUT1JZX1RZUEVfTUVESUFfQVVESU8sIEdTVF9S QU5LX01BUkdJTkFMKTsK