111125 2013-02-28 15:50:25 -0800 Add SPI for marking a WebView as doing things on behalf of another process 2013-03-01 13:34:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam ap webkit.review.bot oldest_to_newest 844570 0 sam 2013-02-28 15:50:25 -0800 Add SPI for marking a WebView as doing things on behalf of another process 844645 1 190853 sam 2013-02-28 17:20:17 -0800 Created attachment 190853 Patch 844649 2 webkit.review.bot 2013-02-28 17:25:22 -0800 Attachment 190853 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/network/NetworkingContext.h', u'Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp', u'Source/WebCore/platform/network/mac/ResourceHandleMac.mm', u'Source/WebKit/mac/ChangeLog', u'Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h', u'Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm', u'Source/WebKit/mac/WebView/WebView.mm', u'Source/WebKit/mac/WebView/WebViewData.h', u'Source/WebKit/mac/WebView/WebViewData.mm', u'Source/WebKit/mac/WebView/WebViewPrivate.h', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.h', u'Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm', u'Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h', u'Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm']" exit_code: 1 Source/WebKit/mac/WebView/WebViewPrivate.h:638: Missing spaces around = [whitespace/operators] [4] Source/WebKit/mac/WebView/WebViewPrivate.h:638: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 16 files If any of these errors are false positives, please file a bug against check-webkit-style. 844753 3 190853 ap 2013-02-28 20:26:45 -0800 Comment on attachment 190853 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190853&action=review Some comments below. No r+, because I have no idea what this is about, and I think that I need to know. Is there a Radar bug? > Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp:466 > +#if PLATFORM(MAC) > +#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 Does iOS still define PLATFORM(MAC)? I thought it no longer did. > Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp:473 > + static const CFStringRef kCFURLConnectionSocketStreamProperties = CFSTR("kCFURLConnectionSocketStreamProperties"); Is this "static const" play still necessary with MSVC? It's certainly no good with gcc and clang. > Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm:24 > +#import "WebViewPrivate.h" > +#import "WebFrameInternal.h" Include order. > Source/WebKit/mac/WebView/WebViewData.h:209 > + NSData *sourceApplicationAuditData; Why is this not a RetainPtr? 845255 4 sam 2013-03-01 09:57:08 -0800 <rdar://problem/13167973> 845268 5 190853 ap 2013-03-01 10:07:18 -0800 Comment on attachment 190853 Patch r=me. Please address the above comments. 845467 6 sam 2013-03-01 13:34:39 -0800 Committed r144495: <http://trac.webkit.org/changeset/144495> 190853 2013-02-28 17:20:17 -0800 2013-03-01 10:07:17 -0800 Patch bug-111125-20130228171629.patch text/plain 18332 sam U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTUwMWE4ZTM5ZWQ1NjM5 NTk0YWNiYWM2MzU5Y2VkZTAyZTRlNjU2ZC4uNTE0ZDIzODRmOWMxZmMwODBjMGNhYzZjZjY5MWQ5 NTk5YTMwMTAwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAyLTI4ICBTYW0g V2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFNQSSBmb3IgbWFya2luZyBh IFdlYlZpZXcgYXMgZG9pbmcgdGhpbmdzIG9uIGJlaGFsZiBvZiBhbm90aGVyIHByb2Nlc3MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTEyNQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9OZXR3b3JraW5nQ29udGV4dC5oOgorICAgICAgICAoTmV0d29ya2luZ0NvbnRleHQp OgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VIYW5kbGVDRk5ldC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlQ0ZVUkxDb25uZWN0aW9u KToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbToK KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpjcmVhdGVOU1VSTENvbm5lY3Rpb24p OgorICAgICAgICBTZXQgdGhlIHNvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhIG9uIHRoZSBVUkwg Y29ubmVjdGlvbiBpZiBhdmFpbGFibGUuCisKIDIwMTMtMDItMjggIERhdmlkIEdyb2dhbiAgPGRn cm9nYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEluZGV4ZWREQjogSU8gZXJyb3Igd2hlbiBj aGVja2luZyBzY2hlbWEgc2hvdWxkIGRlc3Ryb3kgTGV2ZWxEQiBkaXJlY3RvcnkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwppbmRleCAwMjc2NGJmOWRkNjMwMDIxMmNlNjk4Nzc3MzQ4MTczN2I4YzdkMjZlLi4wOWE5 ZTM4ZTM5ZmU5MThmZWUxMDRjNzE4ZGRlNzI0OTI1MTJiZTM0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTMtMDItMjggIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBBZGQgU1BJIGZvciBtYXJraW5nIGEgV2ViVmlldyBhcyBkb2luZyB0aGluZ3Mg b24gYmVoYWxmIG9mIGFub3RoZXIgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMTI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZU5ldHdvcmtpbmdD b250ZXh0Lmg6CisgICAgICAgIChXZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0KToKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tOgorICAgICAgICAo V2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dDo6c291cmNlQXBwbGljYXRpb25BdWRpdERhdGEpOgor ICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfc2V0U291 cmNlQXBwbGljYXRpb25BdWRpdERhdGE6XSk6CisgICAgICAgICgtW1dlYlZpZXcgX3NvdXJjZUFw cGxpY2F0aW9uQXVkaXREYXRhXSk6CisgICAgICAgICogV2ViVmlldy9XZWJWaWV3RGF0YS5oOgor ICAgICAgICAqIFdlYlZpZXcvV2ViVmlld0RhdGEubW06CisgICAgICAgICgtW1dlYlZpZXdQcml2 YXRlIGRlYWxsb2NdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXdQcml2YXRlLmg6CisgICAg ICAgIEFkZCBTUEkgZm9yIHNldHRpbmcgYSBzb3VyY2UgYXBwbGljYXRpb24gZm9yIGEgV2ViVmll dy4KKwogMjAxMy0wMi0yNyAgSm9obiBCYXVtYW4gIDxqYmF1bWFuQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBQbHVnaW4gaW4gaWZyYW1lIG1heSBub3QgZGlzcGxheQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGI2 NWMwMGZkYTk2ZmEwMDE4N2EyNGVkNGQ1MTBkMGI2ZjRhNmFmMWIuLmNkNGE2Nzc4Njk0ZmY1Yjc4 MDRhY2ViMjhiY2YwZWZjNWUxYTAyOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAx My0wMi0yOCAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCisgICAgICAgIEFkZCBTUEkg Zm9yIG1hcmtpbmcgYSBXZWJWaWV3IGFzIGRvaW5nIHRoaW5ncyBvbiBiZWhhbGYgb2YgYW5vdGhl ciBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTExMjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL21hYy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5oOgorICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL21hYy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5tbToKKyAgICAg ICAgKFdlYktpdDo6UmVtb3RlTmV0d29ya2luZ0NvbnRleHQ6OnNvdXJjZUFwcGxpY2F0aW9uQXVk aXREYXRhKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJGcmFt ZU5ldHdvcmtpbmdDb250ZXh0Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9tYWMvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbToKKyAgICAgICAgKFdlYktpdDo6V2Vi RnJhbWVOZXR3b3JraW5nQ29udGV4dDo6c291cmNlQXBwbGljYXRpb25BdWRpdERhdGEpOgorICAg ICAgICBTdHViIG91dCBzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSgpIGNsaWVudCBmdW5jdGlv bi4KKworMjAxMy0wMi0yOCAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgorCiAgICAgICAg IERvbid0IGluc3RhbGwgdW51c2VkIFhQQ1NlcnZpY2VzIG9uIExpb24KICAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzEzMjY0NzEyPgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL05ldHdvcmtpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL05ldHdvcmtpbmdDb250ZXh0LmgKaW5kZXggNjFhODRiNDk0MTgxNDI5ZGNmMmNiMGY2 YTgzM2RmYWMzYmZlMTYyNi4uMDhiYmQ5OGYxZWYzZTQxMTc5YTdhYTJlY2MyYzI1NjY4N2RlM2E1 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JraW5n Q29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya2lu Z0NvbnRleHQuaApAQCAtNzcsNiArNzcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGxv Y2FsRmlsZUNvbnRlbnRTbmlmZmluZ0VuYWJsZWQoKSBjb25zdCA9IDA7IC8vIEZJWE1FOiBSZWNv bmNpbGUgd2l0aCBSZXNvdXJjZUhhbmRsZTo6Zm9yY2VDb250ZW50U25pZmZpbmcoKS4KICAgICB2 aXJ0dWFsIFNjaGVkdWxlUGFpckhhc2hTZXQqIHNjaGVkdWxlZFJ1bkxvb3BQYWlycygpIGNvbnN0 IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIE5TT3BlcmF0aW9uUXVldWUgKnNjaGVkdWxlZE9w ZXJhdGlvblF1ZXVlKCkgY29uc3QgeyByZXR1cm4gMDsgfQorICAgIHZpcnR1YWwgUmV0YWluUHRy PENGRGF0YVJlZj4gc291cmNlQXBwbGljYXRpb25BdWRpdERhdGEoKSBjb25zdCA9IDA7CiAgICAg dmlydHVhbCBSZXNvdXJjZUVycm9yIGJsb2NrZWRFcnJvcihjb25zdCBSZXNvdXJjZVJlcXVlc3Qm KSBjb25zdCA9IDA7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jZi9SZXNvdXJjZUhhbmRsZUNGTmV0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VIYW5kbGVDRk5ldC5jcHAKaW5kZXggZjU1NjlhNmE0 M2E0MThjZjE1ZjAzODU3ZGMxNjE3YmY1MmU5YjZkNC4uNjJkNGUwNmZjOGVjMmZmMjkwMjliYTQ2 MmIwNTBjOWE3NTJiMjE2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jZi9SZXNvdXJjZUhhbmRsZUNGTmV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwCkBAIC0zNzksMjIgKzM3OSw2 IEBAIFJlc291cmNlSGFuZGxlOjp+UmVzb3VyY2VIYW5kbGUoKQogICAgIExPRyhOZXR3b3JrLCAi Q0ZOZXQgLSBEZXN0cm95aW5nIGpvYiAlcCAoJXMpIiwgdGhpcywgZC0+bV9maXJzdFJlcXVlc3Qu dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiB9CiAKLXN0YXRpYyBDRkRpY3Rpb25hcnlS ZWYgY3JlYXRlQ29ubmVjdGlvblByb3BlcnRpZXMoYm9vbCBzaG91bGRVc2VDcmVkZW50aWFsU3Rv cmFnZSkKLXsKLSAgICBzdGF0aWMgY29uc3QgQ0ZTdHJpbmdSZWYgd2ViS2l0UHJpdmF0ZVNlc3Np b25DRiA9IENGU1RSKCJXZWJLaXRQcml2YXRlU2Vzc2lvbiIpOwotICAgIHN0YXRpYyBjb25zdCBD RlN0cmluZ1JlZiBfa0NGVVJMQ29ubmVjdGlvblNlc3Npb25JRCA9IENGU1RSKCJfa0NGVVJMQ29u bmVjdGlvblNlc3Npb25JRCIpOwotICAgIHN0YXRpYyBjb25zdCBDRlN0cmluZ1JlZiBrQ0ZVUkxD b25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcyA9IENGU1RSKCJrQ0ZVUkxDb25uZWN0aW9u U29ja2V0U3RyZWFtUHJvcGVydGllcyIpOwotCi0gICAgQ0ZEaWN0aW9uYXJ5UmVmIHNlc3Npb25J RCA9IHNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdlID8KLSAgICAgICAgQ0ZEaWN0aW9uYXJ5Q3Jl YXRlKDAsIDAsIDAsIDAsICZrQ0ZUeXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVE aWN0aW9uYXJ5VmFsdWVDYWxsQmFja3MpIDoKLSAgICAgICAgQ0ZEaWN0aW9uYXJ5Q3JlYXRlKDAs IChjb25zdCB2b2lkKiopJl9rQ0ZVUkxDb25uZWN0aW9uU2Vzc2lvbklELCAoY29uc3Qgdm9pZCoq KSZ3ZWJLaXRQcml2YXRlU2Vzc2lvbkNGLCAxLCAma0NGVHlwZURpY3Rpb25hcnlLZXlDYWxsQmFj a3MsICZrQ0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKTsKLQotICAgIENGRGljdGlvbmFy eVJlZiBwcm9wZXJ0aWVzRGljdGlvbmFyeSA9IENGRGljdGlvbmFyeUNyZWF0ZSgwLCAoY29uc3Qg dm9pZCoqKSZrQ0ZVUkxDb25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcywgKGNvbnN0IHZv aWQqKikmc2Vzc2lvbklELCAxLCAma0NGVHlwZURpY3Rpb25hcnlLZXlDYWxsQmFja3MsICZrQ0ZU eXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKTsKLQotICAgIENGUmVsZWFzZShzZXNzaW9uSUQp OwotICAgIHJldHVybiBwcm9wZXJ0aWVzRGljdGlvbmFyeTsKLX0KLQogdm9pZCBSZXNvdXJjZUhh bmRsZTo6Y3JlYXRlQ0ZVUkxDb25uZWN0aW9uKGJvb2wgc2hvdWxkVXNlQ3JlZGVudGlhbFN0b3Jh Z2UsIGJvb2wgc2hvdWxkQ29udGVudFNuaWZmKQogewogICAgIGlmICgoIWQtPm1fdXNlci5pc0Vt cHR5KCkgfHwgIWQtPm1fcGFzcy5pc0VtcHR5KCkpICYmICFmaXJzdFJlcXVlc3QoKS51cmwoKS5w cm90b2NvbElzSW5IVFRQRmFtaWx5KCkpIHsKQEAgLTQ3Myw3ICs0NTcsMjIgQEAgdm9pZCBSZXNv dXJjZUhhbmRsZTo6Y3JlYXRlQ0ZVUkxDb25uZWN0aW9uKGJvb2wgc2hvdWxkVXNlQ3JlZGVudGlh bFN0b3JhZ2UsIGJvb2wKICAgICAgICAgMAogI2VuZGlmCiAgICAgfTsKLSAgICBSZXRhaW5QdHI8 Q0ZEaWN0aW9uYXJ5UmVmPiBjb25uZWN0aW9uUHJvcGVydGllcyhBZG9wdENGLCBjcmVhdGVDb25u ZWN0aW9uUHJvcGVydGllcyhzaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZSkpOworCisgICAgQ0ZN dXRhYmxlRGljdGlvbmFyeVJlZiBzdHJlYW1Qcm9wZXJ0aWVzICA9IENGRGljdGlvbmFyeUNyZWF0 ZU11dGFibGUoMCwgMCwgJmtDRlR5cGVEaWN0aW9uYXJ5S2V5Q2FsbEJhY2tzLCAma0NGVHlwZURp Y3Rpb25hcnlWYWx1ZUNhbGxCYWNrcyk7CisgICAgaWYgKCFzaG91bGRVc2VDcmVkZW50aWFsU3Rv cmFnZSkKKyAgICAgICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUoc3RyZWFtUHJvcGVydGllcywgQ0ZT VFIoIl9rQ0ZVUkxDb25uZWN0aW9uU2Vzc2lvbklEIiksIENGU1RSKCJXZWJLaXRQcml2YXRlU2Vz c2lvbiIpKTsKKworI2lmIFBMQVRGT1JNKE1BQykKKyNpZiBQTEFURk9STShJT1MpIHx8IF9fTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAorICAgIFJldGFpblB0cjxDRkRhdGFS ZWY+IHNvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhID0gZC0+bV9jb250ZXh0LT5zb3VyY2VBcHBs aWNhdGlvbkF1ZGl0RGF0YSgpOworICAgIGlmIChzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSkK KyAgICAgICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUoc3RyZWFtUHJvcGVydGllcywgQ0ZTVFIoImtD RlN0cmVhbVByb3BlcnR5U291cmNlQXBwbGljYXRpb24iKSwgc291cmNlQXBwbGljYXRpb25BdWRp dERhdGEuZ2V0KCkpOworI2VuZGlmCisjZW5kaWYKKworICAgIHN0YXRpYyBjb25zdCBDRlN0cmlu Z1JlZiBrQ0ZVUkxDb25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcyA9IENGU1RSKCJrQ0ZV UkxDb25uZWN0aW9uU29ja2V0U3RyZWFtUHJvcGVydGllcyIpOworICAgIFJldGFpblB0cjxDRkRp Y3Rpb25hcnlSZWY+IHByb3BlcnRpZXNEaWN0aW9uYXJ5ID0gYWRvcHRDRihDRkRpY3Rpb25hcnlD cmVhdGUoMCwgKGNvbnN0IHZvaWQqKikma0NGVVJMQ29ubmVjdGlvblNvY2tldFN0cmVhbVByb3Bl cnRpZXMsIChjb25zdCB2b2lkKiopJnN0cmVhbVByb3BlcnRpZXMsIDEsICZrQ0ZUeXBlRGljdGlv bmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3MpKTsKKyAg ICBDRlJlbGVhc2Uoc3RyZWFtUHJvcGVydGllcyk7CiAKICAgICBkLT5tX2Nvbm5lY3Rpb24uYWRv cHRDRihDRlVSTENvbm5lY3Rpb25DcmVhdGVXaXRoUHJvcGVydGllcygwLCByZXF1ZXN0LmdldCgp LCByZWludGVycHJldF9jYXN0PENGVVJMQ29ubmVjdGlvbkNsaWVudCo+KCZjbGllbnQpLCBjb25u ZWN0aW9uUHJvcGVydGllcy5nZXQoKSkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQppbmRleCA2NGJjYmU2 MDA0NjJmNTg5OTI2MzQ0MDI3Yjk3NDNkN2I3MGU3MDVlLi5iMzdhMWYzNzlmMDAxNmEwMmE4MTZm OWFmN2M1ODg4OWZmMjk5YWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQpAQCAtMTc4LDI2ICsxNzgsMjQg QEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlTlNVUkxDb25uZWN0aW9uKGlkIGRlbGVnYXRl LCBib29sIHNob3VsZFVzZUNyZWRlbnRpYWwKICAgICAgICAgbnNSZXF1ZXN0ID0gbXV0YWJsZVJl cXVlc3Q7CiAgICAgfQogCi0jaWYgUExBVEZPUk0oSU9TKSB8fCBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwNjAKLSAgICBBU1NFUlQoW05TVVJMQ29ubmVjdGlvbiBpbnN0YW5j ZXNSZXNwb25kVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2luaXRXaXRoUmVxdWVzdDpkZWxlZ2F0ZTp1 c2VzQ2FjaGU6bWF4Q29udGVudExlbmd0aDpzdGFydEltbWVkaWF0ZWx5OmNvbm5lY3Rpb25Qcm9w ZXJ0aWVzOildKTsKLSAgICBzdGF0aWMgYm9vbCBzdXBwb3J0c1NldHRpbmdDb25uZWN0aW9uUHJv cGVydGllcyA9IHRydWU7Ci0jZWxzZQotICAgIHN0YXRpYyBib29sIHN1cHBvcnRzU2V0dGluZ0Nv bm5lY3Rpb25Qcm9wZXJ0aWVzID0gW05TVVJMQ29ubmVjdGlvbiBpbnN0YW5jZXNSZXNwb25kVG9T ZWxlY3RvcjpAc2VsZWN0b3IoX2luaXRXaXRoUmVxdWVzdDpkZWxlZ2F0ZTp1c2VzQ2FjaGU6bWF4 Q29udGVudExlbmd0aDpzdGFydEltbWVkaWF0ZWx5OmNvbm5lY3Rpb25Qcm9wZXJ0aWVzOildOwot I2VuZGlmCi0KICAgICBpZiAoZC0+bV9zdG9yYWdlU2Vzc2lvbikKICAgICAgICAgbnNSZXF1ZXN0 ID0gW3drQ29weVJlcXVlc3RXaXRoU3RvcmFnZVNlc3Npb24oZC0+bV9zdG9yYWdlU2Vzc2lvbi5n ZXQoKSwgbnNSZXF1ZXN0KSBhdXRvcmVsZWFzZV07CiAKLSAgICBpZiAoc3VwcG9ydHNTZXR0aW5n Q29ubmVjdGlvblByb3BlcnRpZXMpIHsKLSAgICAgICAgTlNEaWN0aW9uYXJ5ICpzZXNzaW9uSUQg PSBzaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZSA/IFtOU0RpY3Rpb25hcnkgZGljdGlvbmFyeV0g OiBbTlNEaWN0aW9uYXJ5IGRpY3Rpb25hcnlXaXRoT2JqZWN0OkAiV2ViS2l0UHJpdmF0ZVNlc3Np b24iIGZvcktleTpAIl9rQ0ZVUkxDb25uZWN0aW9uU2Vzc2lvbklEIl07Ci0gICAgICAgIE5TRGlj dGlvbmFyeSAqcHJvcGVydHlEaWN0aW9uYXJ5ID0gW05TRGljdGlvbmFyeSBkaWN0aW9uYXJ5V2l0 aE9iamVjdDpzZXNzaW9uSUQgZm9yS2V5OkAia0NGVVJMQ29ubmVjdGlvblNvY2tldFN0cmVhbVBy b3BlcnRpZXMiXTsKLSAgICAgICAgZC0+bV9jb25uZWN0aW9uLmFkb3B0TlMoW1tOU1VSTENvbm5l Y3Rpb24gYWxsb2NdIF9pbml0V2l0aFJlcXVlc3Q6bnNSZXF1ZXN0IGRlbGVnYXRlOmRlbGVnYXRl IHVzZXNDYWNoZTpZRVMgbWF4Q29udGVudExlbmd0aDowIHN0YXJ0SW1tZWRpYXRlbHk6Tk8gY29u bmVjdGlvblByb3BlcnRpZXM6cHJvcGVydHlEaWN0aW9uYXJ5XSk7Ci0gICAgICAgIHJldHVybjsK LSAgICB9CisgICAgQVNTRVJUKFtOU1VSTENvbm5lY3Rpb24gaW5zdGFuY2VzUmVzcG9uZFRvU2Vs ZWN0b3I6QHNlbGVjdG9yKF9pbml0V2l0aFJlcXVlc3Q6ZGVsZWdhdGU6dXNlc0NhY2hlOm1heENv bnRlbnRMZW5ndGg6c3RhcnRJbW1lZGlhdGVseTpjb25uZWN0aW9uUHJvcGVydGllczopXSk7CisK KyAgICBOU011dGFibGVEaWN0aW9uYXJ5ICpzdHJlYW1Qcm9wZXJ0aWVzID0gW05TTXV0YWJsZURp Y3Rpb25hcnkgZGljdGlvbmFyeV07CiAKLSAgICBkLT5tX2Nvbm5lY3Rpb24uYWRvcHROUyhbW05T VVJMQ29ubmVjdGlvbiBhbGxvY10gaW5pdFdpdGhSZXF1ZXN0Om5zUmVxdWVzdCBkZWxlZ2F0ZTpk ZWxlZ2F0ZSBzdGFydEltbWVkaWF0ZWx5Ok5PXSk7Ci0gICAgcmV0dXJuOworICAgIGlmICghc2hv dWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2UpCisgICAgICAgIFtzdHJlYW1Qcm9wZXJ0aWVzIHNldE9i amVjdDpAIldlYktpdFByaXZhdGVTZXNzaW9uIiBmb3JLZXk6QCJfa0NGVVJMQ29ubmVjdGlvblNl c3Npb25JRCJdOworCisjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkw CisgICAgUmV0YWluUHRyPENGRGF0YVJlZj4gc291cmNlQXBwbGljYXRpb25BdWRpdERhdGEgPSBk LT5tX2NvbnRleHQtPnNvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhKCk7CisgICAgaWYgKHNvdXJj ZUFwcGxpY2F0aW9uQXVkaXREYXRhKQorICAgICAgICBbc3RyZWFtUHJvcGVydGllcyBzZXRPYmpl Y3Q6KE5TRGF0YSAqKXNvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhLmdldCgpIGZvcktleTpAImtD RlN0cmVhbVByb3BlcnR5U291cmNlQXBwbGljYXRpb24iXTsKKyNlbmRpZgogCisgICAgTlNEaWN0 aW9uYXJ5ICpwcm9wZXJ0eURpY3Rpb25hcnkgPSBbTlNEaWN0aW9uYXJ5IGRpY3Rpb25hcnlXaXRo T2JqZWN0OnN0cmVhbVByb3BlcnRpZXMgZm9yS2V5OkAia0NGVVJMQ29ubmVjdGlvblNvY2tldFN0 cmVhbVByb3BlcnRpZXMiXTsKKyAgICBkLT5tX2Nvbm5lY3Rpb24uYWRvcHROUyhbW05TVVJMQ29u bmVjdGlvbiBhbGxvY10gX2luaXRXaXRoUmVxdWVzdDpuc1JlcXVlc3QgZGVsZWdhdGU6ZGVsZWdh dGUgdXNlc0NhY2hlOllFUyBtYXhDb250ZW50TGVuZ3RoOjAgc3RhcnRJbW1lZGlhdGVseTpOTyBj b25uZWN0aW9uUHJvcGVydGllczpwcm9wZXJ0eURpY3Rpb25hcnldKTsKIH0KIAogYm9vbCBSZXNv dXJjZUhhbmRsZTo6c3RhcnQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5oIGIvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5oCmluZGV4IDRkZTNiMjU5 ZWM1NDM3YTgyZWY0Yjg0ZTEzZjU1NTY4YTliZGU1YjIuLjFmMmVkZWRkY2EwNDNmMzI3MjYyNjJi YmMwODZkOGI1NTM4NzQxZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0LmgKQEAgLTQwLDUgKzQw LDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgbG9jYWxGaWxlQ29udGVudFNuaWZmaW5n RW5hYmxlZCgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6TmV0d29ya1N0 b3JhZ2VTZXNzaW9uJiBzdG9yYWdlU2Vzc2lvbigpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1 YWwgV2ViQ29yZTo6U2NoZWR1bGVQYWlySGFzaFNldCogc2NoZWR1bGVkUnVuTG9vcFBhaXJzKCkg Y29uc3QgT1ZFUlJJREU7CisgICAgdmlydHVhbCBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBzb3VyY2VB cHBsaWNhdGlvbkF1ZGl0RGF0YSgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgV2ViQ29y ZTo6UmVzb3VyY2VFcnJvciBibG9ja2VkRXJyb3IoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JikgY29uc3QgT1ZFUlJJREU7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbSBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW0KaW5kZXgg MzA1NWY5ZWE5NTFmMDM0MGMwYTkyMjgwZjQ5NjdhYzMyZWVhMDA2ZC4uNTYxYWU3NTg5YmMwNTkz ODMwNDRiYThkYjU0MDliMmU3OTUwZDIxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tCkBA IC0yMCw2ICsyMCw4IEBACiAKICNpbXBvcnQgIldlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQuaCIK IAorI2ltcG9ydCAiV2ViVmlld1ByaXZhdGUuaCIKKyNpbXBvcnQgIldlYkZyYW1lSW50ZXJuYWwu aCIKICNpbXBvcnQgPFdlYkNvcmUvRnJhbWVMb2FkZXJDbGllbnQuaD4KICNpbXBvcnQgPFdlYkNv cmUvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1BhZ2UuaD4KQEAg LTUwLDYgKzUyLDIxIEBAIFNjaGVkdWxlUGFpckhhc2hTZXQqIFdlYkZyYW1lTmV0d29ya2luZ0Nv bnRleHQ6OnNjaGVkdWxlZFJ1bkxvb3BQYWlycygpIGNvbnN0CiAgICAgcmV0dXJuIGZyYW1lKCkg JiYgZnJhbWUoKS0+cGFnZSgpID8gZnJhbWUoKS0+cGFnZSgpLT5zY2hlZHVsZWRSdW5Mb29wUGFp cnMoKSA6IDA7CiB9CiAKK1JldGFpblB0cjxDRkRhdGFSZWY+IFdlYkZyYW1lTmV0d29ya2luZ0Nv bnRleHQ6OnNvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhKCkgY29uc3QKK3sKKyAgICBpZiAoIWZy YW1lKCkpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBpZiAoIWZyYW1lKCktPnBhZ2UoKSkK KyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIFdlYlZpZXcgKndlYlZpZXcgPSBraXQoZnJhbWUo KS0+cGFnZSgpKTsKKyAgICBpZiAoIXdlYlZpZXcpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAg ICByZXR1cm4gKENGRGF0YVJlZil3ZWJWaWV3Ll9zb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YTsK K30KKwogUmVzb3VyY2VFcnJvciBXZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0OjpibG9ja2VkRXJy b3IoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KSBjb25zdAogewogICAgIHJldHVybiBm cmFtZSgpLT5sb2FkZXIoKS0+Y2xpZW50KCktPmJsb2NrZWRFcnJvcihyZXF1ZXN0KTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCA4ZGIyMDk5MWE2MGY5ZDk1YjRhZTE1MDU5 ZGI5MGRkMmM5MDY2NWQyLi5iMWYxMDVmMTcwMDA0NzY3MGJlMjMzYzRhY2NkYjQ3YzY1Y2JmZTI4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KKysrIGIv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC0zMDg3LDYgKzMwODcsMjAg QEAgc3RhdGljIFZlY3RvcjxTdHJpbmc+IHRvU3RyaW5nVmVjdG9yKE5TQXJyYXkqIHBhdHRlcm5z KQogICAgIFJlc291cmNlUmVxdWVzdDo6c2V0SFRUUFBpcGVsaW5pbmdFbmFibGVkKGVuYWJsZWQp OwogfQogCistICh2b2lkKV9zZXRTb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YTooTlNEYXRhICop c291cmNlQXBwbGljYXRpb25BdWRpdERhdGEKK3sKKyAgICBpZiAoX3ByaXZhdGUtPnNvdXJjZUFw cGxpY2F0aW9uQXVkaXREYXRhID09IHNvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhKQorICAgICAg ICByZXR1cm47CisKKyAgICBbX3ByaXZhdGUtPnNvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhIHJl bGVhc2VdOworICAgIF9wcml2YXRlLT5zb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSA9IFtzb3Vy Y2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSBjb3B5XTsKK30KKworLSAoTlNEYXRhICopX3NvdXJjZUFw cGxpY2F0aW9uQXVkaXREYXRhCit7CisgICAgcmV0dXJuIF9wcml2YXRlLT5zb3VyY2VBcHBsaWNh dGlvbkF1ZGl0RGF0YTsKK30KKwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gX1dlYlNhZmVGb3J3 YXJkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld0RhdGEu aCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld0RhdGEuaAppbmRleCA2MzRkNzA0 NDg4Y2IwYmZmNTZjZWM2MDI2ZjBmNjhhNjE1MGExN2NjLi40ODk1ZTkzOGE0OTFjNDlhMDY4OWMy NGY2ZjAyNzkzZWE3ZjQ2ODBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlZpZXdEYXRhLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3RGF0 YS5oCkBAIC0yMDUsNSArMjA1LDcgQEAgcHJpdmF0ZToKICNpZiBVU0UoRElDVEFUSU9OX0FMVEVS TkFUSVZFUykKICAgICBPd25QdHI8V2ViQ29yZTo6QWx0ZXJuYXRpdmVUZXh0VUlDb250cm9sbGVy PiBtX2FsdGVybmF0aXZlVGV4dFVJQ29udHJvbGxlcjsKICNlbmRpZgorCisgICAgTlNEYXRhICpz b3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YTsKIH0KIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld0RhdGEubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlZpZXdEYXRhLm1tCmluZGV4IGUyNzY2ZjAxYTM1YmMwN2VlYWE0ODZjMjY1NWI0YzAx YmFlZDk3YTYuLjBjODEzM2FkMzNjZDU3ZDkzN2QwYTkzZGVjZDk3OTFhZTI3NzVkMzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld0RhdGEubW0KKysrIGIvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3RGF0YS5tbQpAQCAtMTI3LDYgKzEyNyw3IEBA IExheWVyRmx1c2hDb250cm9sbGVyOjpMYXllckZsdXNoQ29udHJvbGxlcihXZWJWaWV3KiB3ZWJW aWV3KQogICAgIFtmcmFtZUxvYWREZWxlZ2F0ZUZvcndhcmRlciByZWxlYXNlXTsKICAgICBbZWRp dGluZ0RlbGVnYXRlRm9yd2FyZGVyIHJlbGVhc2VdOwogICAgIFttZWRpYVN0eWxlIHJlbGVhc2Vd OworICAgIFtzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSByZWxlYXNlXTsKIAogICAgIFtzdXBl ciBkZWFsbG9jXTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUu aAppbmRleCA2ODUzYjM0ODg1MzFmZGVjZTMxYWMzY2U3ZjE4ZWI5M2E3ZDBhMDFjLi4zY2NkMjQ1 OGU0YTI3NThiNzVkMDU2ZmI5OGNjN2Q3NWFmZmMyYTcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJWaWV3UHJpdmF0ZS5oCkBAIC02MzUsNiArNjM1LDggQEAgQ291bGQgYmUgd29y dGggYWRkaW5nIHRvIHRoZSBBUEkuCiAgKi8KICsgKHZvaWQpX3NldEhUVFBQaXBlbGluaW5nRW5h YmxlZDooQk9PTCllbmFibGVkOwogCitAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSwgZ2V0dGVy PV9zb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSwgc2V0dGVyPV9zZXRTb3VyY2VBcHBsaWNhdGlv bkF1ZGl0RGF0YTopIE5TRGF0YSAqc291cmNlQXBwbGljYXRpb25BdWRpdERhdGE7CisKIEBlbmQK IAogQGludGVyZmFjZSBXZWJWaWV3IChXZWJWaWV3UHJpbnRpbmdQcml2YXRlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL1JlbW90ZU5ldHdvcmtpbmdDb250 ZXh0LmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9tYWMvUmVtb3RlTmV0d29ya2lu Z0NvbnRleHQuaAppbmRleCAyOTYwZDA0NjgxYzg0YzBjOTYxMzkxYzRiMjk3MGRkZWU4YWRiM2Yy Li43NTE4NDQzYTI5YWM3NzljNzc2OThkMWVhODA2OGMxMmFjZTE0MGNmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9tYWMvUmVtb3RlTmV0d29ya2luZ0NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9tYWMvUmVtb3RlTmV0d29ya2lu Z0NvbnRleHQuaApAQCAtNTUsNiArNTUsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBs b2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVkKCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmly dHVhbCBXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHN0b3JhZ2VTZXNzaW9uKCkgY29u c3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBOU09wZXJhdGlvblF1ZXVlICpzY2hlZHVsZWRPcGVy YXRpb25RdWV1ZSgpIGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwgUmV0YWluUHRyPENGRGF0 YVJlZj4gc291cmNlQXBwbGljYXRpb25BdWRpdERhdGEoKSBjb25zdCBPVkVSUklERTsKICAgICB2 aXJ0dWFsIFdlYkNvcmU6OlJlc291cmNlRXJyb3IgYmxvY2tlZEVycm9yKGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYpIGNvbnN0IE9WRVJSSURFOwogCiAgICAgYm9vbCBtX25lZWRzU2l0 ZVNwZWNpZmljUXVpcmtzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvbWFjL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0Lm1tIGIvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvbWFjL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0Lm1tCmluZGV4IDc4MTk1MzNhNTI5 YjU2YWY0MGEwY2I5ZWM2YWUxYzljNzkxY2EyZWIuLjJmY2YzNzg0NzExNDQwMzljYjczOGMyYmNh MmQxZGJlNjY1ZTQ0MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L21hYy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9tYWMvUmVtb3RlTmV0d29ya2luZ0NvbnRleHQubW0KQEAgLTI2LDggKzI2LDgg QEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAiUmVtb3RlTmV0d29ya2luZ0NvbnRleHQu aCIKIAotI2ltcG9ydCAiV2ViQ29yZS9SZXNvdXJjZUVycm9yLmgiCiAjaW1wb3J0ICJXZWJFcnJv cnMuaCIKKyNpbXBvcnQgPFdlYkNvcmUvUmVzb3VyY2VFcnJvci5oPgogI2ltcG9ydCA8V2ViS2l0 U3lzdGVtSW50ZXJmYWNlLmg+CiAjaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgogCkBAIC0xMDEs NiArMTAxLDExIEBAIE5TT3BlcmF0aW9uUXVldWUgKlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0Ojpz Y2hlZHVsZWRPcGVyYXRpb25RdWV1ZSgpIGNvbnN0CiAgICAgcmV0dXJuIHF1ZXVlOwogfQogCitS ZXRhaW5QdHI8Q0ZEYXRhUmVmPiBSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6c291cmNlQXBwbGlj YXRpb25BdWRpdERhdGEoKSBjb25zdAoreworICAgIHJldHVybiBuaWw7Cit9CisKIFJlc291cmNl RXJyb3IgUmVtb3RlTmV0d29ya2luZ0NvbnRleHQ6OmJsb2NrZWRFcnJvcihjb25zdCBSZXNvdXJj ZVJlcXVlc3QmIHJlcXVlc3QpIGNvbnN0CiB7CiAgICAgcmV0dXJuIFdlYktpdDo6YmxvY2tlZEVy cm9yKHJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5oIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4 dC5oCmluZGV4IGE5MWM4N2JiMzg3MTI1NTAzOTgzMmNlY2I4NGMxYTM1NDZmNGQyZjEuLjQ2YzNm OGYwNmZiMDFhNGZiNjhmZDdjYTdmMTMyYjQ5YmZlODViZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkZyYW1lTmV0d29ya2luZ0Nv bnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21h Yy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0LmgKQEAgLTQ4LDYgKzQ4LDcgQEAgcHJpdmF0ZToK ICAgICB2aXJ0dWFsIGJvb2wgbG9jYWxGaWxlQ29udGVudFNuaWZmaW5nRW5hYmxlZCgpIGNvbnN0 IE9WRVJSSURFOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBz dG9yYWdlU2Vzc2lvbigpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6U2No ZWR1bGVQYWlySGFzaFNldCogc2NoZWR1bGVkUnVuTG9vcFBhaXJzKCkgY29uc3QgT1ZFUlJJREU7 CisgICAgdmlydHVhbCBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0 RGF0YSgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6UmVzb3VyY2VFcnJv ciBibG9ja2VkRXJyb3IoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JikgY29uc3QgT1ZF UlJJREU7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L21hYy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4 dC5tbQppbmRleCA0OGVmOTM3OTBmZTVlNzBjZWY5NTI3MjEyNTY0M2ZhN2UzNjhiYTZmLi4wM2Mz NWJjOTM5YTk0MDRhMTQxOWMzZjE2NWIyMzE5MThkOTUxMDY4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJGcmFtZU5ldHdvcmtpbmdD b250ZXh0Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv bWFjL1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW0KQEAgLTUyLDYgKzUyLDExIEBAIFNjaGVk dWxlUGFpckhhc2hTZXQqIFdlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQ6OnNjaGVkdWxlZFJ1bkxv b3BQYWlycygpIGNvbnN0CiAgICAgcmV0dXJuIGZyYW1lKCkgJiYgZnJhbWUoKS0+cGFnZSgpID8g ZnJhbWUoKS0+cGFnZSgpLT5zY2hlZHVsZWRSdW5Mb29wUGFpcnMoKSA6IDA7CiB9CiAKK1JldGFp blB0cjxDRkRhdGFSZWY+IFdlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQ6OnNvdXJjZUFwcGxpY2F0 aW9uQXVkaXREYXRhKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbmlsOworfQorCiBSZXNvdXJjZUVy cm9yIFdlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQ6OmJsb2NrZWRFcnJvcihjb25zdCBSZXNvdXJj ZVJlcXVlc3QmIHJlcXVlc3QpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGZyYW1lKCktPmxvYWRlcigp LT5jbGllbnQoKS0+YmxvY2tlZEVycm9yKHJlcXVlc3QpOwo=