80430 2012-03-06 10:44:11 -0800 [BlackBerry] Set correct ResourceRequest target type. 2012-03-06 23:25:20 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Other RESOLVED FIXED P2 Normal --- 0 liachen webkit-unassigned japhet rwlbuis tonikitoo webkit.review.bot oldest_to_newest 571975 0 liachen 2012-03-06 10:44:11 -0800 Right now ResourceRequests loaded by appCache are not set with correct target type. Also Worker related ResourceRequest are not correctly set for BlackBerry platform. 571987 1 130406 liachen 2012-03-06 11:00:26 -0800 Created attachment 130406 Patch for 80430 Patch for 80430. 572152 2 130406 rwlbuis 2012-03-06 14:26:31 -0800 Comment on attachment 130406 Patch for 80430 View in context: https://bugs.webkit.org/attachment.cgi?id=130406&action=review The HashMap needs to be static for sure. > Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp:92 > + MimeTypeResourceRequestTypeMap* map = 0; You need to make it static, otherwise you keep allocating it each time the function is called. > Source/WebCore/platform/network/blackberry/ResourceRequestBlackBerry.cpp:114 > + // map->add(String(""), ResourceRequest::TargetIsMedia); Maybe better not include the commented three lines. > Source/WebKit/blackberry/ChangeLog:8 > + Removed unused code in dispatchWillSendRequest(), they are too late! Can you explain what and why it is too late? 572392 3 liachen 2012-03-06 18:13:05 -0800 (In reply to comment #2) > The HashMap needs to be static for sure. > > You need to make it static, otherwise you keep allocating it each time the function is called. Yes, this is an error, will fix. > > Maybe better not include the commented three lines. > Will remove them. > Can you explain what and why it is too late? In FrameLoaderClientBlackBerry::dispatchWillSendRequest() request.initializePlatformRequest() is called before the target type setting codes. And the target type is only referred to by us in initializePlatformRequest(), so it doesn't make sense to change the target type after it is used already. 572414 4 130512 liachen 2012-03-06 18:30:51 -0800 Created attachment 130512 Updated patch based on rwlbuis's comments. 572441 5 130512 rwlbuis 2012-03-06 19:08:04 -0800 Comment on attachment 130512 Updated patch based on rwlbuis's comments. LGTM. 572584 6 130512 webkit.review.bot 2012-03-06 23:25:14 -0800 Comment on attachment 130512 Updated patch based on rwlbuis's comments. Clearing flags on attachment: 130512 Committed r110023: <http://trac.webkit.org/changeset/110023> 572585 7 webkit.review.bot 2012-03-06 23:25:20 -0800 All reviewed patches have been landed. Closing bug. 130406 2012-03-06 11:00:26 -0800 2012-03-06 14:26:30 -0800 Patch for 80430 80430.patch text/plain 12440 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZTI2ZjYyLi42ZDdiMzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTItMDMtMDYgIExpYW5naHVpIENoZW4gIDxsaWFjaGVuQHJpbS5jb20+CisKKyAgICAg ICAgW0JsYWNrQmVycnldIFNldCBjb3JyZWN0IFJlc291cmNlUmVxdWVzdCB0YXJnZXQgdHlwZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNDMwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIGxvYWRz IHN0YXJ0ZWQgYnkgQXBwQ2FjaGUsIHRoZXkgYXJlIGJhc2VkIG9uIHRoZSBtYW5pZmVzdCBmaWxl LAorICAgICAgICBzbyBpdCBpcyBub3QgZGVmaW5pdGVseSBzdXJlIHdoYXQgdGFyZ2V0IGl0IGlz IGZvciwgc28gd2UganVzdCBndWVzcworICAgICAgICBiYXNlZCBvbiBpdHMgbWltZXR5cGUgb3Ig ZmlsZSBleHRlbnNpb24uCisKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25D YWNoZUdyb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6 Y3JlYXRlUmVzb3VyY2VIYW5kbGUpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJl c291cmNlOjpsb2FkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVz b3VyY2VSZXF1ZXN0Lmg6CisgICAgICAgIChSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5LmNwcDoK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6bWltZVJlcXVlc3RUeXBlTWFw KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6dGFyZ2V0VHlwZUZyb21NaW1l VHlwZSk6CisgICAgICAgICogd29ya2Vycy9EZWZhdWx0U2hhcmVkV29ya2VyUmVwb3NpdG9yeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTaGFyZWRXb3JrZXJTY3JpcHRMb2FkZXI6OmxvYWQpOgor ICAgICAgICAqIHdvcmtlcnMvV29ya2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oldvcmtlcjo6 Y3JlYXRlKToKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlckNvbnRleHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6V29ya2VyQ29udGV4dDo6aW1wb3J0U2NyaXB0cyk6CisgICAgICAgICogd29ya2Vy cy9Xb3JrZXJTY3JpcHRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyU2NyaXB0 TG9hZGVyOjpjcmVhdGVSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAqIHdvcmtlcnMvV29ya2Vy U2NyaXB0TG9hZGVyLmg6CisgICAgICAgIChXb3JrZXJTY3JpcHRMb2FkZXIpOgorCiAyMDEyLTAz LTA2ICBMdWNhcyBGb3JzY2hsZXIgIDxsZm9yc2NobGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBX ZWJDb3JlIGJ1aWxkIGV4Y2VlZHMgYWRkcmVzcyBzcGFjZSBvbiAzMi1iaXQgV2luZG93cyBidWls ZHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRp b25DYWNoZUdyb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNh dGlvbkNhY2hlR3JvdXAuY3BwCmluZGV4IDAxM2E3OGQuLmU2MjI5YzQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAu Y3BwCkBAIC00OTAsNiArNDkwLDIyIEBAIFBhc3NSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IEFwcGxp Y2F0aW9uQ2FjaGVHcm91cDo6Y3JlYXRlUmVzb3VyY2VIYW5kbGUoY29uc3QgS1VSCiAgICAgICAg IH0KICAgICB9CiAKKyNpZiBQTEFURk9STShCTEFDS0JFUlJZKQorICAgIFJlc291cmNlUmVxdWVz dDo6VGFyZ2V0VHlwZSB0YXJnZXQgPSBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzVW5zcGVjaWZp ZWQ7CisgICAgaWYgKG5ld2VzdENhY2hlZFJlc291cmNlKSB7CisgICAgICAgIGNvbnN0IFN0cmlu ZyYgbWltZVR5cGUgPSBuZXdlc3RDYWNoZWRSZXNvdXJjZS0+cmVzcG9uc2UoKS5taW1lVHlwZSgp OworICAgICAgICBpZiAoIW1pbWVUeXBlLmlzRW1wdHkoKSkKKyAgICAgICAgICAgIHRhcmdldCA9 IFJlc291cmNlUmVxdWVzdDo6dGFyZ2V0VHlwZUZyb21NaW1lVHlwZShtaW1lVHlwZSk7CisgICAg fQorICAgIGlmICh0YXJnZXQgPT0gUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc1Vuc3BlY2lmaWVk KSB7CisgICAgICAgIFN0cmluZyBtaW1lVHlwZSA9IG1pbWVUeXBlRnJvbURhdGFVUkwodXJsKTsK KyAgICAgICAgaWYgKCFtaW1lVHlwZS5pc0VtcHR5KCkpCisgICAgICAgICAgICB0YXJnZXQgPSBS ZXNvdXJjZVJlcXVlc3Q6OnRhcmdldFR5cGVGcm9tTWltZVR5cGUobWltZVR5cGUpOworICAgIH0K KworICAgIHJlcXVlc3Quc2V0VGFyZ2V0VHlwZSh0YXJnZXQpOworI2VuZGlmCisKICAgICBSZWZQ dHI8UmVzb3VyY2VIYW5kbGU+IGhhbmRsZSA9IFJlc291cmNlSGFuZGxlOjpjcmVhdGUobV9mcmFt ZS0+bG9hZGVyKCktPm5ldHdvcmtpbmdDb250ZXh0KCksIHJlcXVlc3QsIHRoaXMsIGZhbHNlLCB0 cnVlKTsKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIC8vIEJlY2F1c2Ugd2lsbFNlbmRSZXF1 ZXN0IG9ubHkgZ2V0cyBjYWxsZWQgZHVyaW5nIHJlZGlyZWN0cywgd2UgaW5pdGlhbGl6ZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHAKaW5kZXggZTlj NjE5OC4uYTc0ZGJkNiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk UmVzb3VyY2UuY3BwCkBAIC05MSw3ICs5MSw3IEBAIHN0YXRpYyBSZXNvdXJjZUxvYWRQcmlvcml0 eSBkZWZhdWx0UHJpb3JpdHlGb3JSZXNvdXJjZVR5cGUoQ2FjaGVkUmVzb3VyY2U6OlR5cGUKICAg ICByZXR1cm4gUmVzb3VyY2VMb2FkUHJpb3JpdHlMb3c7CiB9CiAKLSNpZiBQTEFURk9STShDSFJP TUlVTSkKKyNpZiBQTEFURk9STShDSFJPTUlVTSkgfHwgUExBVEZPUk0oQkxBQ0tCRVJSWSkKIHN0 YXRpYyBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldFR5cGUgY2FjaGVkUmVzb3VyY2VUeXBlVG9UYXJn ZXRUeXBlKENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUpCiB7CiAgICAgc3dpdGNoICh0eXBlKSB7 CkBAIC0xOTEsNyArMTkxLDcgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZTo6bG9hZChDYWNoZWRSZXNv dXJjZUxvYWRlciogY2FjaGVkUmVzb3VyY2VMb2FkZXIsIGNvbnN0IFJlc28KICAgICBtX29wdGlv bnMgPSBvcHRpb25zOwogICAgIG1fbG9hZGluZyA9IHRydWU7CiAKLSNpZiBQTEFURk9STShDSFJP TUlVTSkKKyNpZiBQTEFURk9STShDSFJPTUlVTSkgfHwgUExBVEZPUk0oQkxBQ0tCRVJSWSkKICAg ICBpZiAobV9yZXNvdXJjZVJlcXVlc3QudGFyZ2V0VHlwZSgpID09IFJlc291cmNlUmVxdWVzdDo6 VGFyZ2V0SXNVbnNwZWNpZmllZCkKICAgICAgICAgbV9yZXNvdXJjZVJlcXVlc3Quc2V0VGFyZ2V0 VHlwZShjYWNoZWRSZXNvdXJjZVR5cGVUb1RhcmdldFR5cGUodHlwZSgpKSk7CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNv dXJjZVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJy eS9SZXNvdXJjZVJlcXVlc3QuaAppbmRleCBjZDk3NjBkLi43MDcyZWIxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291 cmNlUmVxdWVzdC5oCkBAIC0xMTgsNiArMTE4LDggQEAgcHVibGljOgogICAgIFRhcmdldFR5cGUg dGFyZ2V0VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdGFyZ2V0VHlwZTsgfQogICAgIHZvaWQgc2V0 VGFyZ2V0VHlwZShUYXJnZXRUeXBlIHR5cGUpIHsgbV90YXJnZXRUeXBlID0gdHlwZTsgfQogCisg ICAgc3RhdGljIFRhcmdldFR5cGUgdGFyZ2V0VHlwZUZyb21NaW1lVHlwZShjb25zdCBTdHJpbmcm IG1pbWVUeXBlKTsKKwogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0 QmFzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFj a2JlcnJ5L1Jlc291cmNlUmVxdWVzdEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdEJsYWNrQmVycnkuY3BwCmlu ZGV4IGQ4NmI4OGMuLmFmMWM4N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0 QmxhY2tCZXJyeS5jcHAKQEAgLTIyLDYgKzIyLDcgQEAKICNpbmNsdWRlICJCbG9iUmVnaXN0cnlJ bXBsLmgiCiAjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtQ2xpZW50Lmg+CiAjaW5jbHVkZSA8 bmV0d29yay9OZXR3b3JrUmVxdWVzdC5oPgorI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5j bHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCiB1c2luZyBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6 TmV0d29ya1JlcXVlc3Q7CkBAIC04NCw2ICs4NSw1MCBAQCBzdGF0aWMgaW5saW5lIE5ldHdvcmtS ZXF1ZXN0OjpUYXJnZXRUeXBlIHBsYXRmb3JtVGFyZ2V0VHlwZUZvclJlcXVlc3QoY29uc3QgUmVz bwogICAgIH0KIH0KIAordHlwZWRlZiBIYXNoTWFwPFN0cmluZywgUmVzb3VyY2VSZXF1ZXN0OjpU YXJnZXRUeXBlPiBNaW1lVHlwZVJlc291cmNlUmVxdWVzdFR5cGVNYXA7CisKK3N0YXRpYyBjb25z dCBNaW1lVHlwZVJlc291cmNlUmVxdWVzdFR5cGVNYXAmIG1pbWVSZXF1ZXN0VHlwZU1hcCgpCit7 CisgICAgTWltZVR5cGVSZXNvdXJjZVJlcXVlc3RUeXBlTWFwKiBtYXAgPSAwOworICAgIGlmICgh bWFwKSB7CisgICAgICAgIG1hcCA9IG5ldyBNaW1lVHlwZVJlc291cmNlUmVxdWVzdFR5cGVNYXA7 CisKKyAgICAgICAgaWYgKG1hcCkgeworICAgICAgICAgICAgLy8gVGhlIGxpc3QgaGVyZSBzaG91 bGQgbWF0Y2ggZXh0ZW5zaW9uTWFwW10gaW4gTUlNRVR5cGVSZWdpc3RyeUJsYWNrQmVycnkuY3Bw CisgICAgICAgICAgICBtYXAtPmFkZChTdHJpbmcoInRleHQvY3NzIiksIFJlc291cmNlUmVxdWVz dDo6VGFyZ2V0SXNTdHlsZVNoZWV0KTsKKyAgICAgICAgICAgIG1hcC0+YWRkKFN0cmluZygiYXBw bGljYXRpb24veC1qYXZhc2NyaXB0IiksIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNTY3JpcHQp OworICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS9ibXAiKSwgUmVzb3VyY2VSZXF1 ZXN0OjpUYXJnZXRJc0ltYWdlKTsKKyAgICAgICAgICAgIG1hcC0+YWRkKFN0cmluZygiaW1hZ2Uv Z2lmIiksIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNJbWFnZSk7CisgICAgICAgICAgICBtYXAt PmFkZChTdHJpbmcoImltYWdlL3gtaWNvbiIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1h Z2UpOworICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS9qcGVnIiksIFJlc291cmNl UmVxdWVzdDo6VGFyZ2V0SXNJbWFnZSk7CisgICAgICAgICAgICBtYXAtPmFkZChTdHJpbmcoImlt YWdlL3BuZyIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2UpOworICAgICAgICAgICAg bWFwLT5hZGQoU3RyaW5nKCJpbWFnZS94LXBvcnRhYmxlLWJpdG1hcCIpLCBSZXNvdXJjZVJlcXVl c3Q6OlRhcmdldElzSW1hZ2UpOworICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS94 LXBvcnRhYmxlLWdyYXltYXAiKSwgUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc0ltYWdlKTsKKyAg ICAgICAgICAgIG1hcC0+YWRkKFN0cmluZygiaW1hZ2UveC1wb3J0YWJsZS1waXhtYXAiKSwgUmVz b3VyY2VSZXF1ZXN0OjpUYXJnZXRJc0ltYWdlKTsKKyAgICAgICAgICAgIG1hcC0+YWRkKFN0cmlu ZygiaW1hZ2Uvc3ZnK3htbCIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2UpOworICAg ICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS90aWZmIiksIFJlc291cmNlUmVxdWVzdDo6 VGFyZ2V0SXNJbWFnZSk7CisgICAgICAgICAgICBtYXAtPmFkZChTdHJpbmcoImltYWdlL3gteGJp dG1hcCIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2UpOworICAgICAgICAgICAgbWFw LT5hZGQoU3RyaW5nKCJpbWFnZS94LXhwbSIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1h Z2UpOworICAgICAgICAgICAgLy8gbWFwLT5hZGQoU3RyaW5nKCIiKSwgUmVzb3VyY2VSZXF1ZXN0 OjpUYXJnZXRJc0ZvbnRSZXNvdXJjZSk7CisgICAgICAgICAgICAvLyBtYXAtPmFkZChTdHJpbmco IiIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzT2JqZWN0KTsKKyAgICAgICAgICAgIC8vIG1h cC0+YWRkKFN0cmluZygiIiksIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNNZWRpYSk7CisgICAg ICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gKm1hcDsKK30KKworUmVzb3VyY2VSZXF1ZXN0OjpU YXJnZXRUeXBlIFJlc291cmNlUmVxdWVzdDo6dGFyZ2V0VHlwZUZyb21NaW1lVHlwZShjb25zdCBT dHJpbmcmIG1pbWVUeXBlKQoreworICAgIGNvbnN0IE1pbWVUeXBlUmVzb3VyY2VSZXF1ZXN0VHlw ZU1hcCYgbWFwID0gbWltZVJlcXVlc3RUeXBlTWFwKCk7CisKKyAgICBNaW1lVHlwZVJlc291cmNl UmVxdWVzdFR5cGVNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ZXIgPSBtYXAuZmluZChtaW1lVHlwZSk7 CisgICAgaWYgKGl0ZXIgPT0gbWFwLmVuZCgpKQorICAgICAgICByZXR1cm4gUmVzb3VyY2VSZXF1 ZXN0OjpUYXJnZXRJc1Vuc3BlY2lmaWVkOworCisgICAgcmV0dXJuIGl0ZXItPnNlY29uZDsKK30K Kwogdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OmluaXRpYWxpemVQbGF0Zm9ybVJlcXVlc3QoTmV0d29y a1JlcXVlc3QmIHBsYXRmb3JtUmVxdWVzdCwgYm9vbCBpc0luaXRpYWwpIGNvbnN0CiB7CiAgICAg Ly8gSWYgdGhpcyBpcyB0aGUgaW5pdGlhbCBsb2FkLCBza2lwIHRoZSByZXF1ZXN0IGJvZHkgYW5k IGhlYWRlcnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL0RlZmF1bHRTaGFy ZWRXb3JrZXJSZXBvc2l0b3J5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvRGVmYXVsdFNo YXJlZFdvcmtlclJlcG9zaXRvcnkuY3BwCmluZGV4IDRhZTMwZTQuLjc3M2NjZDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvRGVmYXVsdFNoYXJlZFdvcmtlclJlcG9zaXRvcnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvRGVmYXVsdFNoYXJlZFdvcmtlclJlcG9z aXRvcnkuY3BwCkBAIC0yOTgsNyArMjk4LDcgQEAgdm9pZCBTaGFyZWRXb3JrZXJTY3JpcHRMb2Fk ZXI6OmxvYWQoY29uc3QgS1VSTCYgdXJsKQogCiAgICAgLy8gTWFyayB0aGlzIG9iamVjdCBhcyBh Y3RpdmUgZm9yIHRoZSBkdXJhdGlvbiBvZiB0aGUgbG9hZC4KICAgICBtX3NjcmlwdExvYWRlciA9 IFdvcmtlclNjcmlwdExvYWRlcjo6Y3JlYXRlKCk7Ci0jaWYgUExBVEZPUk0oQ0hST01JVU0pCisj aWYgUExBVEZPUk0oQ0hST01JVU0pIHx8IFBMQVRGT1JNKEJMQUNLQkVSUlkpCiAgICAgbV9zY3Jp cHRMb2FkZXItPnNldFRhcmdldFR5cGUoUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc1NoYXJlZFdv cmtlcik7CiAjZW5kaWYKICAgICBtX3NjcmlwdExvYWRlci0+bG9hZEFzeW5jaHJvbm91c2x5KG1f d29ya2VyLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIHVybCwgRGVueUNyb3NzT3JpZ2luUmVx dWVzdHMsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIuY3BwCmluZGV4IGVjOTY1YTQuLjFk NDQwZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlci5jcHAKQEAgLTcwLDcgKzcwLDcgQEAgUGFz c1JlZlB0cjxXb3JrZXI+IFdvcmtlcjo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNv bnRleHQsIGNvbnN0IFN0cmluZyYKICAgICB3b3JrZXItPnNldFBlbmRpbmdBY3Rpdml0eSh3b3Jr ZXIuZ2V0KCkpOwogCiAgICAgd29ya2VyLT5tX3NjcmlwdExvYWRlciA9IFdvcmtlclNjcmlwdExv YWRlcjo6Y3JlYXRlKCk7Ci0jaWYgUExBVEZPUk0oQ0hST01JVU0pCisjaWYgUExBVEZPUk0oQ0hS T01JVU0pIHx8IFBMQVRGT1JNKEJMQUNLQkVSUlkpCiAgICAgd29ya2VyLT5tX3NjcmlwdExvYWRl ci0+c2V0VGFyZ2V0VHlwZShSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzV29ya2VyKTsKICNlbmRp ZgogICAgIHdvcmtlci0+bV9zY3JpcHRMb2FkZXItPmxvYWRBc3luY2hyb25vdXNseShjb250ZXh0 LCBzY3JpcHRVUkwsIERlbnlDcm9zc09yaWdpblJlcXVlc3RzLCB3b3JrZXIuZ2V0KCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyQ29udGV4dC5jcHAKaW5kZXggZWQzNDM4OC4uZjcyZjA5 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJDb250ZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckNvbnRleHQuY3BwCkBAIC0yNDMsNyAr MjQzLDcgQEAgdm9pZCBXb3JrZXJDb250ZXh0OjppbXBvcnRTY3JpcHRzKGNvbnN0IFZlY3RvcjxT dHJpbmc+JiB1cmxzLCBFeGNlcHRpb25Db2RlJiBlYykKIAogICAgIGZvciAoVmVjdG9yPEtVUkw+ Ojpjb25zdF9pdGVyYXRvciBpdCA9IGNvbXBsZXRlZFVSTHMuYmVnaW4oKTsgaXQgIT0gZW5kOyAr K2l0KSB7CiAgICAgICAgIFJlZlB0cjxXb3JrZXJTY3JpcHRMb2FkZXI+IHNjcmlwdExvYWRlcihX b3JrZXJTY3JpcHRMb2FkZXI6OmNyZWF0ZSgpKTsKLSNpZiBQTEFURk9STShDSFJPTUlVTSkKKyNp ZiBQTEFURk9STShDSFJPTUlVTSkgfHwgUExBVEZPUk0oQkxBQ0tCRVJSWSkKICAgICAgICAgc2Ny aXB0TG9hZGVyLT5zZXRUYXJnZXRUeXBlKFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNTY3JpcHQp OwogI2VuZGlmCiAgICAgICAgIHNjcmlwdExvYWRlci0+bG9hZFN5bmNocm9ub3VzbHkoc2NyaXB0 RXhlY3V0aW9uQ29udGV4dCgpLCAqaXQsIEFsbG93Q3Jvc3NPcmlnaW5SZXF1ZXN0cyk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclNjcmlwdExvYWRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclNjcmlwdExvYWRlci5jcHAKaW5kZXggOTU0NzZm OC4uMzI5NmY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJTY3Jp cHRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyU2NyaXB0TG9h ZGVyLmNwcApAQCAtMTA5LDcgKzEwOSw3IEBAIFBhc3NPd25QdHI8UmVzb3VyY2VSZXF1ZXN0PiBX b3JrZXJTY3JpcHRMb2FkZXI6OmNyZWF0ZVJlc291cmNlUmVxdWVzdCgpCiB7CiAgICAgT3duUHRy PFJlc291cmNlUmVxdWVzdD4gcmVxdWVzdCA9IGFkb3B0UHRyKG5ldyBSZXNvdXJjZVJlcXVlc3Qo bV91cmwpKTsKICAgICByZXF1ZXN0LT5zZXRIVFRQTWV0aG9kKCJHRVQiKTsKLSNpZiBQTEFURk9S TShDSFJPTUlVTSkKKyNpZiBQTEFURk9STShDSFJPTUlVTSkgfHwgUExBVEZPUk0oQkxBQ0tCRVJS WSkKICAgICByZXF1ZXN0LT5zZXRUYXJnZXRUeXBlKG1fdGFyZ2V0VHlwZSk7CiAjZW5kaWYKICAg ICByZXR1cm4gcmVxdWVzdC5yZWxlYXNlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93 b3JrZXJzL1dvcmtlclNjcmlwdExvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3Jr ZXJTY3JpcHRMb2FkZXIuaAppbmRleCBkNmU3ZGUzLi44NWM0ZWE4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclNjcmlwdExvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvV29ya2VyU2NyaXB0TG9hZGVyLmgKQEAgLTcyLDcgKzcyLDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkRmFpbChjb25zdCBSZXNvdXJj ZUVycm9yJik7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRGYWlsUmVkaXJlY3RDaGVjaygpOwog Ci0jaWYgUExBVEZPUk0oQ0hST01JVU0pCisjaWYgUExBVEZPUk0oQ0hST01JVU0pIHx8IFBMQVRG T1JNKEJMQUNLQkVSUlkpCiAgICAgICAgIHZvaWQgc2V0VGFyZ2V0VHlwZShSZXNvdXJjZVJlcXVl c3Q6OlRhcmdldFR5cGUgdGFyZ2V0VHlwZSkgeyBtX3RhcmdldFR5cGUgPSB0YXJnZXRUeXBlOyB9 CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggYzgzYmU1NS4uZTgz NmY0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIw MTItMDMtMDYgIExpYW5naHVpIENoZW4gIDxsaWFjaGVuQHJpbS5jb20+CisKKyAgICAgICAgW0Js YWNrQmVycnldIFNldCBjb3JyZWN0IFJlc291cmNlUmVxdWVzdCB0YXJnZXQgdHlwZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNDMwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCB1bnVzZWQg Y29kZSBpbiBkaXNwYXRjaFdpbGxTZW5kUmVxdWVzdCgpLCB0aGV5IGFyZSB0b28gbGF0ZSEKKwor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRpc3BhdGNo V2lsbFNlbmRSZXF1ZXN0KToKKwogMjAxMi0wMy0wNiAgSmFrb2IgUGV0c292aXRzICA8anBldHNv dml0c0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBEb24ndCBzdXNwZW5kIGFjY2Vs IGNvbXAgd2hlbiBiYWNrZ3JvdW5kaW5nIGEgcGFnZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnku Y3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggN2FiMWU3MS4uMGVlZjFmMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTk2OSwxMiArOTY5LDYgQEAg dm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0 KERvY3VtZW50TG9hZGVyKiBkb2NMb2EKICAgICAgICAgICAgIGZpbmFsVXJsLmNoYXJhY3RlcnMo KSwgZmluYWxVcmwubGVuZ3RoKCkpOwogICAgIH0KIAotICAgIC8vIEZJWE1FOiBVcGRhdGUgdGhl IHJlcXVlc3QgdHlwZS4gU2VlIFBSICMxMTk3OTIuCi0gICAgaWYgKGRvY0xvYWRlci0+ZnJhbWVM b2FkZXIoKS0+aXNMb2FkaW5nTWFpbkZyYW1lKCkpCi0gICAgICAgIHJlcXVlc3Quc2V0VGFyZ2V0 VHlwZShSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzTWFpbkZyYW1lKTsKLSAgICBlbHNlCi0gICAg ICAgIHJlcXVlc3Quc2V0VGFyZ2V0VHlwZShSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzU3ViZnJh bWUpOwotCiAgICAgRnJhbWVMb2FkZXIqIGxvYWRlciA9IG1fZnJhbWUtPmxvYWRlcigpOwogICAg IEFTU0VSVChsb2FkZXIpOwogICAgIGlmIChpc0JhY2tGb3J3YXJkTG9hZFR5cGUobG9hZGVyLT5s b2FkVHlwZSgpKSkgewo= 130512 2012-03-06 18:30:51 -0800 2012-03-06 23:25:13 -0800 Updated patch based on rwlbuis's comments. 80430-2.patch text/plain 12446 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxMzc1M2IxLi5mZGQ1NmE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTItMDMtMDYgIExpYW5naHVpIENoZW4gIDxsaWFjaGVuQHJpbS5jb20+CisKKyAgICAg ICAgW0JsYWNrQmVycnldIFNldCBjb3JyZWN0IFJlc291cmNlUmVxdWVzdCB0YXJnZXQgdHlwZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNDMwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIGxvYWRz IHN0YXJ0ZWQgYnkgQXBwQ2FjaGUsIHRoZXkgYXJlIGJhc2VkIG9uIHRoZSBtYW5pZmVzdCBmaWxl LAorICAgICAgICBpdCBpcyBub3QgZGVmaW5pdGVseSBzdXJlIHdoYXQgdGFyZ2V0IGl0IGlzIGZv ciwgc28gd2UganVzdCBndWVzcworICAgICAgICBiYXNlZCBvbiBpdHMgbWltZXR5cGUgb3IgZmls ZSBleHRlbnNpb24uCisKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNo ZUdyb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6Y3Jl YXRlUmVzb3VyY2VIYW5kbGUpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZS5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291 cmNlOjpsb2FkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3Vy Y2VSZXF1ZXN0Lmg6CisgICAgICAgIChSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6bWltZVR5cGVSZXF1ZXN0VHlwZU1h cCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OnRhcmdldFR5cGVGcm9tTWlt ZVR5cGUpOgorICAgICAgICAqIHdvcmtlcnMvRGVmYXVsdFNoYXJlZFdvcmtlclJlcG9zaXRvcnku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hhcmVkV29ya2VyU2NyaXB0TG9hZGVyOjpsb2FkKToK KyAgICAgICAgKiB3b3JrZXJzL1dvcmtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXI6 OmNyZWF0ZSk6CisgICAgICAgICogd29ya2Vycy9Xb3JrZXJDb250ZXh0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OldvcmtlckNvbnRleHQ6OmltcG9ydFNjcmlwdHMpOgorICAgICAgICAqIHdvcmtl cnMvV29ya2VyU2NyaXB0TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclNjcmlw dExvYWRlcjo6Y3JlYXRlUmVzb3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtl clNjcmlwdExvYWRlci5oOgorICAgICAgICAoV29ya2VyU2NyaXB0TG9hZGVyKToKKwogMjAxMi0w My0wNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFRp bGUgY2FjaGUgbGF5ZXJzIHNob3VsZCBhbHdheXMgYmUgY2xpcHBlZCB0byB0aGUgdmlldydzIGJv dW5kcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0 aW9uQ2FjaGVHcm91cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGlj YXRpb25DYWNoZUdyb3VwLmNwcAppbmRleCAwMTNhNzhkLi5lNjIyOWM0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3Vw LmNwcApAQCAtNDkwLDYgKzQ5MCwyMiBAQCBQYXNzUmVmUHRyPFJlc291cmNlSGFuZGxlPiBBcHBs aWNhdGlvbkNhY2hlR3JvdXA6OmNyZWF0ZVJlc291cmNlSGFuZGxlKGNvbnN0IEtVUgogICAgICAg ICB9CiAgICAgfQogCisjaWYgUExBVEZPUk0oQkxBQ0tCRVJSWSkKKyAgICBSZXNvdXJjZVJlcXVl c3Q6OlRhcmdldFR5cGUgdGFyZ2V0ID0gUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc1Vuc3BlY2lm aWVkOworICAgIGlmIChuZXdlc3RDYWNoZWRSZXNvdXJjZSkgeworICAgICAgICBjb25zdCBTdHJp bmcmIG1pbWVUeXBlID0gbmV3ZXN0Q2FjaGVkUmVzb3VyY2UtPnJlc3BvbnNlKCkubWltZVR5cGUo KTsKKyAgICAgICAgaWYgKCFtaW1lVHlwZS5pc0VtcHR5KCkpCisgICAgICAgICAgICB0YXJnZXQg PSBSZXNvdXJjZVJlcXVlc3Q6OnRhcmdldFR5cGVGcm9tTWltZVR5cGUobWltZVR5cGUpOworICAg IH0KKyAgICBpZiAodGFyZ2V0ID09IFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNVbnNwZWNpZmll ZCkgeworICAgICAgICBTdHJpbmcgbWltZVR5cGUgPSBtaW1lVHlwZUZyb21EYXRhVVJMKHVybCk7 CisgICAgICAgIGlmICghbWltZVR5cGUuaXNFbXB0eSgpKQorICAgICAgICAgICAgdGFyZ2V0ID0g UmVzb3VyY2VSZXF1ZXN0Ojp0YXJnZXRUeXBlRnJvbU1pbWVUeXBlKG1pbWVUeXBlKTsKKyAgICB9 CisKKyAgICByZXF1ZXN0LnNldFRhcmdldFR5cGUodGFyZ2V0KTsKKyNlbmRpZgorCiAgICAgUmVm UHRyPFJlc291cmNlSGFuZGxlPiBoYW5kbGUgPSBSZXNvdXJjZUhhbmRsZTo6Y3JlYXRlKG1fZnJh bWUtPmxvYWRlcigpLT5uZXR3b3JraW5nQ29udGV4dCgpLCByZXF1ZXN0LCB0aGlzLCBmYWxzZSwg dHJ1ZSk7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKICAgICAvLyBCZWNhdXNlIHdpbGxTZW5kUmVx dWVzdCBvbmx5IGdldHMgY2FsbGVkIGR1cmluZyByZWRpcmVjdHMsIHdlIGluaXRpYWxpemUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCmluZGV4IGU5 YzYxOTguLmE3NGRiZDYgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZFJlc291cmNlLmNwcApAQCAtOTEsNyArOTEsNyBAQCBzdGF0aWMgUmVzb3VyY2VMb2FkUHJpb3Jp dHkgZGVmYXVsdFByaW9yaXR5Rm9yUmVzb3VyY2VUeXBlKENhY2hlZFJlc291cmNlOjpUeXBlCiAg ICAgcmV0dXJuIFJlc291cmNlTG9hZFByaW9yaXR5TG93OwogfQogCi0jaWYgUExBVEZPUk0oQ0hS T01JVU0pCisjaWYgUExBVEZPUk0oQ0hST01JVU0pIHx8IFBMQVRGT1JNKEJMQUNLQkVSUlkpCiBz dGF0aWMgUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRUeXBlIGNhY2hlZFJlc291cmNlVHlwZVRvVGFy Z2V0VHlwZShDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlKQogewogICAgIHN3aXRjaCAodHlwZSkg ewpAQCAtMTkxLDcgKzE5MSw3IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2U6OmxvYWQoQ2FjaGVkUmVz b3VyY2VMb2FkZXIqIGNhY2hlZFJlc291cmNlTG9hZGVyLCBjb25zdCBSZXNvCiAgICAgbV9vcHRp b25zID0gb3B0aW9uczsKICAgICBtX2xvYWRpbmcgPSB0cnVlOwogCi0jaWYgUExBVEZPUk0oQ0hS T01JVU0pCisjaWYgUExBVEZPUk0oQ0hST01JVU0pIHx8IFBMQVRGT1JNKEJMQUNLQkVSUlkpCiAg ICAgaWYgKG1fcmVzb3VyY2VSZXF1ZXN0LnRhcmdldFR5cGUoKSA9PSBSZXNvdXJjZVJlcXVlc3Q6 OlRhcmdldElzVW5zcGVjaWZpZWQpCiAgICAgICAgIG1fcmVzb3VyY2VSZXF1ZXN0LnNldFRhcmdl dFR5cGUoY2FjaGVkUmVzb3VyY2VUeXBlVG9UYXJnZXRUeXBlKHR5cGUoKSkpOwogI2VuZGlmCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVz b3VyY2VSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVy cnkvUmVzb3VyY2VSZXF1ZXN0LmgKaW5kZXggY2Q5NzYwZC4uNzA3MmViMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVz dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNv dXJjZVJlcXVlc3QuaApAQCAtMTE4LDYgKzExOCw4IEBAIHB1YmxpYzoKICAgICBUYXJnZXRUeXBl IHRhcmdldFR5cGUoKSBjb25zdCB7IHJldHVybiBtX3RhcmdldFR5cGU7IH0KICAgICB2b2lkIHNl dFRhcmdldFR5cGUoVGFyZ2V0VHlwZSB0eXBlKSB7IG1fdGFyZ2V0VHlwZSA9IHR5cGU7IH0KIAor ICAgIHN0YXRpYyBUYXJnZXRUeXBlIHRhcmdldFR5cGVGcm9tTWltZVR5cGUoY29uc3QgU3RyaW5n JiBtaW1lVHlwZSk7CisKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFJlc291cmNlUmVxdWVz dEJhc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxh Y2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5LmNwcApp bmRleCBkODZiODhjLi41YjY3OTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0QmxhY2tCZXJyeS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVz dEJsYWNrQmVycnkuY3BwCkBAIC0yMiw2ICsyMiw3IEBACiAjaW5jbHVkZSAiQmxvYlJlZ2lzdHJ5 SW1wbC5oIgogI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybUNsaWVudC5oPgogI2luY2x1ZGUg PG5ldHdvcmsvTmV0d29ya1JlcXVlc3QuaD4KKyNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2lu Y2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogdXNpbmcgQmxhY2tCZXJyeTo6UGxhdGZvcm06 Ok5ldHdvcmtSZXF1ZXN0OwpAQCAtODQsNiArODUsNDcgQEAgc3RhdGljIGlubGluZSBOZXR3b3Jr UmVxdWVzdDo6VGFyZ2V0VHlwZSBwbGF0Zm9ybVRhcmdldFR5cGVGb3JSZXF1ZXN0KGNvbnN0IFJl c28KICAgICB9CiB9CiAKK3R5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFJlc291cmNlUmVxdWVzdDo6 VGFyZ2V0VHlwZT4gTWltZVR5cGVSZXNvdXJjZVJlcXVlc3RUeXBlTWFwOworCitzdGF0aWMgY29u c3QgTWltZVR5cGVSZXNvdXJjZVJlcXVlc3RUeXBlTWFwJiBtaW1lVHlwZVJlcXVlc3RUeXBlTWFw KCkKK3sKKyAgICBzdGF0aWMgTWltZVR5cGVSZXNvdXJjZVJlcXVlc3RUeXBlTWFwKiBtYXAgPSAw OworICAgIGlmICghbWFwKSB7CisgICAgICAgIG1hcCA9IG5ldyBNaW1lVHlwZVJlc291cmNlUmVx dWVzdFR5cGVNYXA7CisKKyAgICAgICAgaWYgKG1hcCkgeworICAgICAgICAgICAgLy8gVGhlIGxp c3QgaGVyZSBzaG91bGQgbWF0Y2ggZXh0ZW5zaW9uTWFwW10gaW4gTUlNRVR5cGVSZWdpc3RyeUJs YWNrQmVycnkuY3BwCisgICAgICAgICAgICBtYXAtPmFkZChTdHJpbmcoInRleHQvY3NzIiksIFJl c291cmNlUmVxdWVzdDo6VGFyZ2V0SXNTdHlsZVNoZWV0KTsKKyAgICAgICAgICAgIG1hcC0+YWRk KFN0cmluZygiYXBwbGljYXRpb24veC1qYXZhc2NyaXB0IiksIFJlc291cmNlUmVxdWVzdDo6VGFy Z2V0SXNTY3JpcHQpOworICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS9ibXAiKSwg UmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc0ltYWdlKTsKKyAgICAgICAgICAgIG1hcC0+YWRkKFN0 cmluZygiaW1hZ2UvZ2lmIiksIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNJbWFnZSk7CisgICAg ICAgICAgICBtYXAtPmFkZChTdHJpbmcoImltYWdlL3gtaWNvbiIpLCBSZXNvdXJjZVJlcXVlc3Q6 OlRhcmdldElzSW1hZ2UpOworICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS9qcGVn IiksIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNJbWFnZSk7CisgICAgICAgICAgICBtYXAtPmFk ZChTdHJpbmcoImltYWdlL3BuZyIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2UpOwor ICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS94LXBvcnRhYmxlLWJpdG1hcCIpLCBS ZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2UpOworICAgICAgICAgICAgbWFwLT5hZGQoU3Ry aW5nKCJpbWFnZS94LXBvcnRhYmxlLWdyYXltYXAiKSwgUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJ c0ltYWdlKTsKKyAgICAgICAgICAgIG1hcC0+YWRkKFN0cmluZygiaW1hZ2UveC1wb3J0YWJsZS1w aXhtYXAiKSwgUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc0ltYWdlKTsKKyAgICAgICAgICAgIG1h cC0+YWRkKFN0cmluZygiaW1hZ2Uvc3ZnK3htbCIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElz SW1hZ2UpOworICAgICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS90aWZmIiksIFJlc291 cmNlUmVxdWVzdDo6VGFyZ2V0SXNJbWFnZSk7CisgICAgICAgICAgICBtYXAtPmFkZChTdHJpbmco ImltYWdlL3gteGJpdG1hcCIpLCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzSW1hZ2UpOworICAg ICAgICAgICAgbWFwLT5hZGQoU3RyaW5nKCJpbWFnZS94LXhwbSIpLCBSZXNvdXJjZVJlcXVlc3Q6 OlRhcmdldElzSW1hZ2UpOworICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuICptYXA7Cit9 CisKK1Jlc291cmNlUmVxdWVzdDo6VGFyZ2V0VHlwZSBSZXNvdXJjZVJlcXVlc3Q6OnRhcmdldFR5 cGVGcm9tTWltZVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKK3sKKyAgICBjb25zdCBNaW1l VHlwZVJlc291cmNlUmVxdWVzdFR5cGVNYXAmIG1hcCA9IG1pbWVUeXBlUmVxdWVzdFR5cGVNYXAo KTsKKworICAgIE1pbWVUeXBlUmVzb3VyY2VSZXF1ZXN0VHlwZU1hcDo6Y29uc3RfaXRlcmF0b3Ig aXRlciA9IG1hcC5maW5kKG1pbWVUeXBlKTsKKyAgICBpZiAoaXRlciA9PSBtYXAuZW5kKCkpCisg ICAgICAgIHJldHVybiBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzVW5zcGVjaWZpZWQ7CisKKyAg ICByZXR1cm4gaXRlci0+c2Vjb25kOworfQorCiB2b2lkIFJlc291cmNlUmVxdWVzdDo6aW5pdGlh bGl6ZVBsYXRmb3JtUmVxdWVzdChOZXR3b3JrUmVxdWVzdCYgcGxhdGZvcm1SZXF1ZXN0LCBib29s IGlzSW5pdGlhbCkgY29uc3QKIHsKICAgICAvLyBJZiB0aGlzIGlzIHRoZSBpbml0aWFsIGxvYWQs IHNraXAgdGhlIHJlcXVlc3QgYm9keSBhbmQgaGVhZGVycy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvRGVmYXVsdFNoYXJlZFdvcmtlclJlcG9zaXRvcnkuY3BwIGIvU291cmNl L1dlYkNvcmUvd29ya2Vycy9EZWZhdWx0U2hhcmVkV29ya2VyUmVwb3NpdG9yeS5jcHAKaW5kZXgg NGFlMzBlNC4uNzczY2NkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9EZWZh dWx0U2hhcmVkV29ya2VyUmVwb3NpdG9yeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9EZWZhdWx0U2hhcmVkV29ya2VyUmVwb3NpdG9yeS5jcHAKQEAgLTI5OCw3ICsyOTgsNyBAQCB2 b2lkIFNoYXJlZFdvcmtlclNjcmlwdExvYWRlcjo6bG9hZChjb25zdCBLVVJMJiB1cmwpCiAKICAg ICAvLyBNYXJrIHRoaXMgb2JqZWN0IGFzIGFjdGl2ZSBmb3IgdGhlIGR1cmF0aW9uIG9mIHRoZSBs b2FkLgogICAgIG1fc2NyaXB0TG9hZGVyID0gV29ya2VyU2NyaXB0TG9hZGVyOjpjcmVhdGUoKTsK LSNpZiBQTEFURk9STShDSFJPTUlVTSkKKyNpZiBQTEFURk9STShDSFJPTUlVTSkgfHwgUExBVEZP Uk0oQkxBQ0tCRVJSWSkKICAgICBtX3NjcmlwdExvYWRlci0+c2V0VGFyZ2V0VHlwZShSZXNvdXJj ZVJlcXVlc3Q6OlRhcmdldElzU2hhcmVkV29ya2VyKTsKICNlbmRpZgogICAgIG1fc2NyaXB0TG9h ZGVyLT5sb2FkQXN5bmNocm9ub3VzbHkobV93b3JrZXItPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQo KSwgdXJsLCBEZW55Q3Jvc3NPcmlnaW5SZXF1ZXN0cywgdGhpcyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dv cmtlci5jcHAKaW5kZXggZWM5NjVhNC4uMWQ0NDBmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvd29ya2Vycy9Xb3JrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2Vy LmNwcApAQCAtNzAsNyArNzAsNyBAQCBQYXNzUmVmUHRyPFdvcmtlcj4gV29ya2VyOjpjcmVhdGUo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgY29uc3QgU3RyaW5nJgogICAgIHdvcmtl ci0+c2V0UGVuZGluZ0FjdGl2aXR5KHdvcmtlci5nZXQoKSk7CiAKICAgICB3b3JrZXItPm1fc2Ny aXB0TG9hZGVyID0gV29ya2VyU2NyaXB0TG9hZGVyOjpjcmVhdGUoKTsKLSNpZiBQTEFURk9STShD SFJPTUlVTSkKKyNpZiBQTEFURk9STShDSFJPTUlVTSkgfHwgUExBVEZPUk0oQkxBQ0tCRVJSWSkK ICAgICB3b3JrZXItPm1fc2NyaXB0TG9hZGVyLT5zZXRUYXJnZXRUeXBlKFJlc291cmNlUmVxdWVz dDo6VGFyZ2V0SXNXb3JrZXIpOwogI2VuZGlmCiAgICAgd29ya2VyLT5tX3NjcmlwdExvYWRlci0+ bG9hZEFzeW5jaHJvbm91c2x5KGNvbnRleHQsIHNjcmlwdFVSTCwgRGVueUNyb3NzT3JpZ2luUmVx dWVzdHMsIHdvcmtlci5nZXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJz L1dvcmtlckNvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJDb250ZXh0 LmNwcAppbmRleCBlZDM0Mzg4Li5mNzJmMDlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93 b3JrZXJzL1dvcmtlckNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29y a2VyQ29udGV4dC5jcHAKQEAgLTI0Myw3ICsyNDMsNyBAQCB2b2lkIFdvcmtlckNvbnRleHQ6Omlt cG9ydFNjcmlwdHMoY29uc3QgVmVjdG9yPFN0cmluZz4mIHVybHMsIEV4Y2VwdGlvbkNvZGUmIGVj KQogCiAgICAgZm9yIChWZWN0b3I8S1VSTD46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gY29tcGxldGVk VVJMcy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgUmVmUHRyPFdvcmtlclNj cmlwdExvYWRlcj4gc2NyaXB0TG9hZGVyKFdvcmtlclNjcmlwdExvYWRlcjo6Y3JlYXRlKCkpOwot I2lmIFBMQVRGT1JNKENIUk9NSVVNKQorI2lmIFBMQVRGT1JNKENIUk9NSVVNKSB8fCBQTEFURk9S TShCTEFDS0JFUlJZKQogICAgICAgICBzY3JpcHRMb2FkZXItPnNldFRhcmdldFR5cGUoUmVzb3Vy Y2VSZXF1ZXN0OjpUYXJnZXRJc1NjcmlwdCk7CiAjZW5kaWYKICAgICAgICAgc2NyaXB0TG9hZGVy LT5sb2FkU3luY2hyb25vdXNseShzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksICppdCwgQWxsb3dD cm9zc09yaWdpblJlcXVlc3RzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMv V29ya2VyU2NyaXB0TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyU2Ny aXB0TG9hZGVyLmNwcAppbmRleCA5NTQ3NmY4Li4zMjk2ZjRlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL1dvcmtlclNjcmlwdExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvd29ya2Vycy9Xb3JrZXJTY3JpcHRMb2FkZXIuY3BwCkBAIC0xMDksNyArMTA5LDcgQEAgUGFz c093blB0cjxSZXNvdXJjZVJlcXVlc3Q+IFdvcmtlclNjcmlwdExvYWRlcjo6Y3JlYXRlUmVzb3Vy Y2VSZXF1ZXN0KCkKIHsKICAgICBPd25QdHI8UmVzb3VyY2VSZXF1ZXN0PiByZXF1ZXN0ID0gYWRv cHRQdHIobmV3IFJlc291cmNlUmVxdWVzdChtX3VybCkpOwogICAgIHJlcXVlc3QtPnNldEhUVFBN ZXRob2QoIkdFVCIpOwotI2lmIFBMQVRGT1JNKENIUk9NSVVNKQorI2lmIFBMQVRGT1JNKENIUk9N SVVNKSB8fCBQTEFURk9STShCTEFDS0JFUlJZKQogICAgIHJlcXVlc3QtPnNldFRhcmdldFR5cGUo bV90YXJnZXRUeXBlKTsKICNlbmRpZgogICAgIHJldHVybiByZXF1ZXN0LnJlbGVhc2UoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyU2NyaXB0TG9hZGVyLmggYi9T b3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclNjcmlwdExvYWRlci5oCmluZGV4IGQ2ZTdkZTMu Ljg1YzRlYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyU2NyaXB0 TG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJTY3JpcHRMb2FkZXIu aApAQCAtNzIsNyArNzIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwg dm9pZCBkaWRGYWlsKGNvbnN0IFJlc291cmNlRXJyb3ImKTsKICAgICAgICAgdmlydHVhbCB2b2lk IGRpZEZhaWxSZWRpcmVjdENoZWNrKCk7CiAKLSNpZiBQTEFURk9STShDSFJPTUlVTSkKKyNpZiBQ TEFURk9STShDSFJPTUlVTSkgfHwgUExBVEZPUk0oQkxBQ0tCRVJSWSkKICAgICAgICAgdm9pZCBz ZXRUYXJnZXRUeXBlKFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0VHlwZSB0YXJnZXRUeXBlKSB7IG1f dGFyZ2V0VHlwZSA9IHRhcmdldFR5cGU7IH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0No YW5nZUxvZwppbmRleCBlZWE5M2ExLi5hMjRmMzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsNSArMSwxOSBAQAogMjAxMi0wMy0wNiAgTGlhbmdodWkgQ2hlbiAgPGxpYWNo ZW5AcmltLmNvbT4KIAorICAgICAgICBbQmxhY2tCZXJyeV0gU2V0IGNvcnJlY3QgUmVzb3VyY2VS ZXF1ZXN0IHRhcmdldCB0eXBlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODA0MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZW1vdmVkIHVudXNlZCBjb2RlIGluIGRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0 KCkuIFRoZXNlIGNvZGVzIGFyZSB0b28KKyAgICAgICAgbGF0ZSBhcyB0aGUgdGFyZ2V0IHR5cGUg aGFzIGFscmVhZHkgYmVlbiByZWZlcnJlZCB0byB3aGVuIGNhbGxpbmcKKyAgICAgICAgUmVzb3Vy Y2VSZXF1ZXN0Ojppbml0aWFsaXplUGxhdGZvcm1SZXF1ZXN0KCkuCisKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpkaXNwYXRjaFdpbGxTZW5kUmVxdWVz dCk6CisKKzIwMTItMDMtMDYgIExpYW5naHVpIENoZW4gIDxsaWFjaGVuQHJpbS5jb20+CisKICAg ICAgICAgW0JsYWNrQmVycnldIFJlbW92ZSB1bnVzZWQgYW5kIHVubmVlZGVkIFdlYlBhZ2VDbGll bnQ6OmRvd25sb2FkUmVxdWVzdGVkKE5ldHdvcmtSZXF1ZXN0JikKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNDM4CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNr QmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1l TG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggN2FiMWU3MS4uMGVlZjFmMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTk2OSwxMiArOTY5 LDYgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRpc3BhdGNoV2lsbFNlbmRS ZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBkb2NMb2EKICAgICAgICAgICAgIGZpbmFsVXJsLmNoYXJh Y3RlcnMoKSwgZmluYWxVcmwubGVuZ3RoKCkpOwogICAgIH0KIAotICAgIC8vIEZJWE1FOiBVcGRh dGUgdGhlIHJlcXVlc3QgdHlwZS4gU2VlIFBSICMxMTk3OTIuCi0gICAgaWYgKGRvY0xvYWRlci0+ ZnJhbWVMb2FkZXIoKS0+aXNMb2FkaW5nTWFpbkZyYW1lKCkpCi0gICAgICAgIHJlcXVlc3Quc2V0 VGFyZ2V0VHlwZShSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElzTWFpbkZyYW1lKTsKLSAgICBlbHNl Ci0gICAgICAgIHJlcXVlc3Quc2V0VGFyZ2V0VHlwZShSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldElz U3ViZnJhbWUpOwotCiAgICAgRnJhbWVMb2FkZXIqIGxvYWRlciA9IG1fZnJhbWUtPmxvYWRlcigp OwogICAgIEFTU0VSVChsb2FkZXIpOwogICAgIGlmIChpc0JhY2tGb3J3YXJkTG9hZFR5cGUobG9h ZGVyLT5sb2FkVHlwZSgpKSkgewo=