189651 2018-09-16 08:21:10 -0700 Add more ResourceLoading logging, particularly in MemoryCache code 2018-09-17 12:40:36 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cdumez commit-queue dbates ews-watchlist japhet simon.fraser thorton webkit-bug-importer oldest_to_newest 1460079 0 simon.fraser 2018-09-16 08:21:10 -0700 Add more ResourceLoading logging, particularly in MemoryCache code 1460080 1 349872 simon.fraser 2018-09-16 08:22:19 -0700 Created attachment 349872 Patch 1460265 2 349872 commit-queue 2018-09-17 12:39:43 -0700 Comment on attachment 349872 Patch Clearing flags on attachment: 349872 Committed r236078: <https://trac.webkit.org/changeset/236078> 1460266 3 commit-queue 2018-09-17 12:39:45 -0700 All reviewed patches have been landed. Closing bug. 1460267 4 webkit-bug-importer 2018-09-17 12:40:36 -0700 <rdar://problem/44530315> 349872 2018-09-16 08:22:19 -0700 2018-09-17 12:39:43 -0700 Patch bug-189651-20180916082218.patch text/plain 11857 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1ODMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE3MDQyYzQ4M2MyOWM0 YjBjYjk0NjVmYzgzM2UxYzE4YWQ2ZTM1Ny4uMDk5YzdlZWYwMDU0OWRmMjczYmQ4MzA3ODljNDJk YjU5ZTlkODc3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTA5LTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBtb3JlIFJl c291cmNlTG9hZGluZyBsb2dnaW5nLCBwYXJ0aWN1bGFybHkgaW4gTWVtb3J5Q2FjaGUgY29kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5NjUxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkaW5nIG1v cmUgbG9nZ2luZyB0byB0aGUgUmVzb3VyY2VMb2FkaW5nIGxvZyBjaGFubmVsLCB3aGljaCBJIGZv dW5kIHVzZWZ1bAorICAgICAgICB3aGVuIHRyeWluZyB0byB1bmRlcnN0YW5kIGNhY2hlZCBTVkdJ bWFnZSBsaWZldGltZXMgKGJ1ZyAxODk0MzcpLgorCisgICAgICAgICogbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlOjpkZWxl dGVJZlBvc3NpYmxlKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2Fk ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RS ZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6Z2FyYmFn ZUNvbGxlY3REb2N1bWVudFJlc291cmNlcyk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL01lbW9y eUNhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjphZGQpOgorICAgICAg ICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OnBydW5lTGl2ZVJlc291cmNlc1RvU2l6ZSk6CisgICAg ICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6cHJ1bmVEZWFkUmVzb3VyY2VzKToKKyAgICAgICAg KFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpwcnVuZURlYWRSZXNvdXJjZXNUb1NpemUpOgorICAgICAg ICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OnJlbW92ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZW1v cnlDYWNoZTo6ZHVtcExSVUxpc3RzIGNvbnN0KToKKwogMjAxOC0wOS0xNSAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBNYW55IG1vZGVybiBtZWRpYSBj b250cm9sIHRlc3RzIGxlYWsgZG9jdW1lbnRzIGluIHRlc3RpbmcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCmluZGV4IGI0MGYxMzBlNmI3NTVlN2Uz NzUwMDViOTE1Zjg4NzY0ZDlkYzM3ZDIuLjVlMWUzZjFkM2NkMTRhNDZhMjc0OWE0OGExOTM5Y2Ey ZDYzODhiNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRS ZXNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlLmNwcApAQCAtNjEyLDYgKzYxMiw3IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2U6OmRlY29kZWRE YXRhRGVsZXRpb25UaW1lckZpcmVkKCkKIGJvb2wgQ2FjaGVkUmVzb3VyY2U6OmRlbGV0ZUlmUG9z c2libGUoKQogewogICAgIGlmIChjYW5EZWxldGUoKSkgeworICAgICAgICBMT0coUmVzb3VyY2VM b2FkaW5nLCAiQ2FjaGVkUmVzb3VyY2UgJXAgZGVsZXRlSWZQb3NzaWJsZSAtIGNhbiBkZWxldGUs IGluIGNhY2hlICVkIiwgdGhpcywgaW5DYWNoZSgpKTsKICAgICAgICAgaWYgKCFpbkNhY2hlKCkp IHsKICAgICAgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbERlc3Ryb3lDYWNo ZWRSZXNvdXJjZSgqdGhpcyk7CiAgICAgICAgICAgICBkZWxldGUgdGhpczsKQEAgLTYyMCw2ICs2 MjEsOCBAQCBib29sIENhY2hlZFJlc291cmNlOjpkZWxldGVJZlBvc3NpYmxlKCkKICAgICAgICAg aWYgKG1fZGF0YSkKICAgICAgICAgICAgIG1fZGF0YS0+aGludE1lbW9yeU5vdE5lZWRlZFNvb24o KTsKICAgICB9CisKKyAgICBMT0coUmVzb3VyY2VMb2FkaW5nLCAiQ2FjaGVkUmVzb3VyY2UgJXAg ZGVsZXRlSWZQb3NzaWJsZSAtIGNhbid0IGRlbGV0ZSAoaGFzQ2xpZW50cyAlZCBsb2FkZXIgJXAg cHJlbG9hZENvdW50ICV1IGhhbmRsZUNvdW50ICV1IHJlc291cmNlVG9SZXZhbGlkYXRlICVwIHBy b3h5UmVzb3VyY2UgJXApIiwgdGhpcywgaGFzQ2xpZW50cygpLCBtX2xvYWRlci5nZXQoKSwgbV9w cmVsb2FkQ291bnQsIG1faGFuZGxlQ291bnQsIG1fcmVzb3VyY2VUb1JldmFsaWRhdGUsIG1fcHJv eHlSZXNvdXJjZSk7CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAppbmRleCA5ZDNkMTA4 MTEzY2MzNzkzMzViNTJmOTRlMjhlMzA5NTIyOTRmOGY3Li5iNTAxYTg1NmExYTMyODlkZDFjZDVk NDJhYTAyZTlhNTEzNDUzOWNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTc4OSw3ICs3ODksNyBAQCBSZXNvdXJj ZUVycm9yT3I8Q2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+PiBDYWNoZWRSZXNv dXJjZUxvYWRlcjo6cmVxdQogICAgIHJlcXVlc3QudXBkYXRlUmVmZXJyZXJQb2xpY3koZG9jdW1l bnQoKSA/IGRvY3VtZW50KCktPnJlZmVycmVyUG9saWN5KCkgOiBSZWZlcnJlclBvbGljeTo6Tm9S ZWZlcnJlcldoZW5Eb3duZ3JhZGUpOwogICAgIFVSTCB1cmwgPSByZXF1ZXN0LnJlc291cmNlUmVx dWVzdCgpLnVybCgpOwogCi0gICAgTE9HKFJlc291cmNlTG9hZGluZywgIkNhY2hlZFJlc291cmNl TG9hZGVyOjpyZXF1ZXN0UmVzb3VyY2UgJyVzJywgY2hhcnNldCAnJXMnLCBwcmlvcml0eT0lZCwg Zm9yUHJlbG9hZD0ldSIsIHVybC5zdHJpbmdDZW50ZXJFbGxpcHNpemVkVG9MZW5ndGgoKS5sYXRp bjEoKS5kYXRhKCksIHJlcXVlc3QuY2hhcnNldCgpLmxhdGluMSgpLmRhdGEoKSwgcmVxdWVzdC5w cmlvcml0eSgpID8gc3RhdGljX2Nhc3Q8aW50PihyZXF1ZXN0LnByaW9yaXR5KCkudmFsdWUoKSkg OiAtMSwgZm9yUHJlbG9hZCA9PSBGb3JQcmVsb2FkOjpZZXMpOworICAgIExPRyhSZXNvdXJjZUxv YWRpbmcsICJDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlICclLjI1NXMnLCBj aGFyc2V0ICclcycsIHByaW9yaXR5PSVkLCBmb3JQcmVsb2FkPSV1IiwgdXJsLnN0cmluZ0NlbnRl ckVsbGlwc2l6ZWRUb0xlbmd0aCgpLmxhdGluMSgpLmRhdGEoKSwgcmVxdWVzdC5jaGFyc2V0KCku bGF0aW4xKCkuZGF0YSgpLCByZXF1ZXN0LnByaW9yaXR5KCkgPyBzdGF0aWNfY2FzdDxpbnQ+KHJl cXVlc3QucHJpb3JpdHkoKS52YWx1ZSgpKSA6IC0xLCBmb3JQcmVsb2FkID09IEZvclByZWxvYWQ6 Olllcyk7CiAKICAgICBpZiAoIXVybC5pc1ZhbGlkKCkpIHsKICAgICAgICAgUkVMRUFTRV9MT0df SUZfQUxMT1dFRCgicmVxdWVzdFJlc291cmNlOiBVUkwgaXMgaW52YWxpZCAoZnJhbWUgPSAlcCki LCBmcmFtZSgpKTsKQEAgLTEzMjksMTAgKzEzMjksMTQgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZUxv YWRlcjo6bG9hZERvbmUoTG9hZENvbXBsZXRpb25UeXBlIHR5cGUsIGJvb2wgc2hvdWxkUGVyZm9y bVAKIC8vIHJlbW92ZSBpdCBmcm9tIHRoZSBtYXAuCiB2b2lkIENhY2hlZFJlc291cmNlTG9hZGVy OjpnYXJiYWdlQ29sbGVjdERvY3VtZW50UmVzb3VyY2VzKCkKIHsKKyAgICBMT0coUmVzb3VyY2VM b2FkaW5nLCAiQ2FjaGVkUmVzb3VyY2VMb2FkZXIgJXAgZ2FyYmFnZUNvbGxlY3REb2N1bWVudFJl c291cmNlcyIsIHRoaXMpOworCiAgICAgdHlwZWRlZiBWZWN0b3I8U3RyaW5nLCAxMD4gU3RyaW5n VmVjdG9yOwogICAgIFN0cmluZ1ZlY3RvciByZXNvdXJjZXNUb0RlbGV0ZTsKIAogICAgIGZvciAo YXV0byYgcmVzb3VyY2UgOiBtX2RvY3VtZW50UmVzb3VyY2VzKSB7CisgICAgICAgIExPRyhSZXNv dXJjZUxvYWRpbmcsICIgIGNhY2hlZCByZXNvdXJjZSAlcCAtIGhhc09uZUhhbmRsZSAlZCIsIHJl c291cmNlLnZhbHVlLmdldCgpLCByZXNvdXJjZS52YWx1ZS0+aGFzT25lSGFuZGxlKCkpOworCiAg ICAgICAgIGlmIChyZXNvdXJjZS52YWx1ZS0+aGFzT25lSGFuZGxlKCkpIHsKICAgICAgICAgICAg IHJlc291cmNlc1RvRGVsZXRlLmFwcGVuZChyZXNvdXJjZS5rZXkpOwogICAgICAgICAgICAgcmVz b3VyY2UudmFsdWUtPnNldE93bmluZ0NhY2hlZFJlc291cmNlTG9hZGVyKG51bGxwdHIpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKaW5kZXggY2UxNzc5ZDM1 MmNmM2U5NTJmYmJlYTVjMGY4NzNiZjU2NmIxOTBjMC4uOTZlN2I1NDNhODg1MzA5ZWQ2NzU1Mzk1 MmY1YzVmNGJlNDIxMGI5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L01lbW9yeUNhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5 Q2FjaGUuY3BwCkBAIC0xMjIsNyArMTIyLDcgQEAgYm9vbCBNZW1vcnlDYWNoZTo6YWRkKENhY2hl ZFJlc291cmNlJiByZXNvdXJjZSkKICAgICAKICAgICByZXNvdXJjZUFjY2Vzc2VkKHJlc291cmNl KTsKICAgICAKLSAgICBMT0coUmVzb3VyY2VMb2FkaW5nLCAiTWVtb3J5Q2FjaGU6OmFkZCBBZGRl ZCAnJXMnLCByZXNvdXJjZSAlcFxuIiwgcmVzb3VyY2UudXJsKCkuc3RyaW5nKCkubGF0aW4xKCku ZGF0YSgpLCAmcmVzb3VyY2UpOworICAgIExPRyhSZXNvdXJjZUxvYWRpbmcsICJNZW1vcnlDYWNo ZTo6YWRkIEFkZGVkICclLjI1NXMnLCByZXNvdXJjZSAlcFxuIiwgcmVzb3VyY2UudXJsKCkuc3Ry aW5nKCkubGF0aW4xKCkuZGF0YSgpLCAmcmVzb3VyY2UpOwogICAgIHJldHVybiB0cnVlOwogfQog CkBAIC0yOTcsNiArMjk3LDkgQEAgdm9pZCBNZW1vcnlDYWNoZTo6cHJ1bmVMaXZlUmVzb3VyY2Vz VG9TaXplKHVuc2lnbmVkIHRhcmdldFNpemUsIGJvb2wgc2hvdWxkRGVzdHIKIHsKICAgICBpZiAo bV9pblBydW5lUmVzb3VyY2VzKQogICAgICAgICByZXR1cm47CisKKyAgICBMT0coUmVzb3VyY2VM b2FkaW5nLCAiTWVtb3J5Q2FjaGU6OnBydW5lTGl2ZVJlc291cmNlc1RvU2l6ZSglZCwgc2hvdWxk RGVzdHJveURlY29kZWREYXRhRm9yQWxsTGl2ZVJlc291cmNlcyA9ICVkKSIsIHRhcmdldFNpemUs IHNob3VsZERlc3Ryb3lEZWNvZGVkRGF0YUZvckFsbExpdmVSZXNvdXJjZXMpOworCiAgICAgU2V0 Rm9yU2NvcGU8Ym9vbD4gcmVlbnRyYW5jeVByb3RlY3RvcihtX2luUHJ1bmVSZXNvdXJjZXMsIHRy dWUpOwogCiAgICAgTW9ub3RvbmljVGltZSBjdXJyZW50VGltZSA9IEZyYW1lVmlldzo6Y3VycmVu dFBhaW50VGltZVN0YW1wKCk7CkBAIC0zMTUsNiArMzE4LDggQEAgdm9pZCBNZW1vcnlDYWNoZTo6 cHJ1bmVMaXZlUmVzb3VyY2VzVG9TaXplKHVuc2lnbmVkIHRhcmdldFNpemUsIGJvb2wgc2hvdWxk RGVzdHIKICAgICB3aGlsZSAoaXQgIT0gbV9saXZlRGVjb2RlZFJlc291cmNlcy5lbmQoKSkgewog ICAgICAgICBhdXRvKiBjdXJyZW50ID0gKml0OwogCisgICAgICAgIExPRyhSZXNvdXJjZUxvYWRp bmcsICIgbGl2ZSByZXNvdXJjZSAlcCAlLjI1NXMgLSBsb2FkZWQgJWQsIGRlY29kZWRTaXplICV1 IiwgY3VycmVudCwgY3VycmVudC0+dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgY3VycmVu dC0+aXNMb2FkZWQoKSwgY3VycmVudC0+ZGVjb2RlZFNpemUoKSk7CisKICAgICAgICAgLy8gSW5j cmVtZW50IHRoZSBpdGVyYXRvciBub3cgYmVjYXVzZSB0aGUgY2FsbCB0byBkZXN0cm95RGVjb2Rl ZERhdGEoKSBiZWxvdwogICAgICAgICAvLyBtYXkgY2F1c2UgYSBjYWxsIHRvIExpc3RIYXNoU2V0 OjpyZW1vdmUoKSBhbmQgaW52YWxpZGF0ZSB0aGUgY3VycmVudAogICAgICAgICAvLyBpdGVyYXRv ci4gTm90ZSB0aGF0IHRoaXMgaXMgc2FmZSBiZWNhdXNlIHVubGlrZSBpdGVyYXRpb24gb2YgbW9z dApAQCAtMzI3LDggKzMzMiwxMCBAQCB2b2lkIE1lbW9yeUNhY2hlOjpwcnVuZUxpdmVSZXNvdXJj ZXNUb1NpemUodW5zaWduZWQgdGFyZ2V0U2l6ZSwgYm9vbCBzaG91bGREZXN0cgogICAgICAgICBp ZiAoY3VycmVudC0+aXNMb2FkZWQoKSAmJiBjdXJyZW50LT5kZWNvZGVkU2l6ZSgpKSB7CiAgICAg ICAgICAgICAvLyBDaGVjayB0byBzZWUgaWYgdGhlIHJlbWFpbmluZyByZXNvdXJjZXMgYXJlIHRv byBuZXcgdG8gcHJ1bmUuCiAgICAgICAgICAgICBTZWNvbmRzIGVsYXBzZWRUaW1lID0gY3VycmVu dFRpbWUgLSBjdXJyZW50LT5tX2xhc3REZWNvZGVkQWNjZXNzVGltZTsKLSAgICAgICAgICAgIGlm ICghc2hvdWxkRGVzdHJveURlY29kZWREYXRhRm9yQWxsTGl2ZVJlc291cmNlcyAmJiBlbGFwc2Vk VGltZSA8IGNNaW5EZWxheUJlZm9yZUxpdmVEZWNvZGVkUHJ1bmUpCisgICAgICAgICAgICBpZiAo IXNob3VsZERlc3Ryb3lEZWNvZGVkRGF0YUZvckFsbExpdmVSZXNvdXJjZXMgJiYgZWxhcHNlZFRp bWUgPCBjTWluRGVsYXlCZWZvcmVMaXZlRGVjb2RlZFBydW5lKSB7CisgICAgICAgICAgICAgICAg TE9HKFJlc291cmNlTG9hZGluZywgIiBjdXJyZW50IHRpbWUgaXMgbGVzcyB0aGFuIG1pbiBkZWxh eSBiZWZvcmUgcHJ1bmluZyAoJS4zZm1zKSIsIGVsYXBzZWRUaW1lLm1pbGxpc2Vjb25kcygpKTsK ICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8v IERlc3Ryb3kgb3VyIGRlY29kZWQgZGF0YS4gVGhpcyB3aWxsIHJlbW92ZSB1cyBmcm9tIG1fbGl2 ZURlY29kZWRSZXNvdXJjZXMsIGFuZCBwb3NzaWJseSBtb3ZlIHVzCiAgICAgICAgICAgICAvLyB0 byBhIGRpZmZlcmVudCBMUlUgbGlzdCBpbiBtX2FsbFJlc291cmNlcy4KQEAgLTM0Miw2ICszNDks OCBAQCB2b2lkIE1lbW9yeUNhY2hlOjpwcnVuZUxpdmVSZXNvdXJjZXNUb1NpemUodW5zaWduZWQg dGFyZ2V0U2l6ZSwgYm9vbCBzaG91bGREZXN0cgogCiB2b2lkIE1lbW9yeUNhY2hlOjpwcnVuZURl YWRSZXNvdXJjZXMoKQogeworICAgIExPRyhSZXNvdXJjZUxvYWRpbmcsICJNZW1vcnlDYWNoZTo6 cHJ1bmVEZWFkUmVzb3VyY2VzIik7CisKICAgICB1bnNpZ25lZCBjYXBhY2l0eSA9IGRlYWRDYXBh Y2l0eSgpOwogICAgIGlmIChjYXBhY2l0eSAmJiBtX2RlYWRTaXplIDw9IGNhcGFjaXR5KQogICAg ICAgICByZXR1cm47CkBAIC0zNTQsNiArMzYzLDkgQEAgdm9pZCBNZW1vcnlDYWNoZTo6cHJ1bmVE ZWFkUmVzb3VyY2VzVG9TaXplKHVuc2lnbmVkIHRhcmdldFNpemUpCiB7CiAgICAgaWYgKG1faW5Q cnVuZVJlc291cmNlcykKICAgICAgICAgcmV0dXJuOworCisgICAgTE9HKFJlc291cmNlTG9hZGlu ZywgIk1lbW9yeUNhY2hlOjpwcnVuZURlYWRSZXNvdXJjZXNUb1NpemUoJWQpIiwgdGFyZ2V0U2l6 ZSk7CisKICAgICBTZXRGb3JTY29wZTxib29sPiByZWVudHJhbmN5UHJvdGVjdG9yKG1faW5QcnVu ZVJlc291cmNlcywgdHJ1ZSk7CiAgCiAgICAgaWYgKHRhcmdldFNpemUgJiYgbV9kZWFkU2l6ZSA8 PSB0YXJnZXRTaXplKQpAQCAtMzY1LDkgKzM3NywxMiBAQCB2b2lkIE1lbW9yeUNhY2hlOjpwcnVu ZURlYWRSZXNvdXJjZXNUb1NpemUodW5zaWduZWQgdGFyZ2V0U2l6ZSkKICAgICAgICAgLy8gZGVz dHJveURlY29kZWREYXRhKCkgY2FuIGFsdGVyIHRoZSBMUlVMaXN0LgogICAgICAgICBhdXRvIGxy dUxpc3QgPSBjb3B5VG9WZWN0b3IoKm1fYWxsUmVzb3VyY2VzW2ldKTsKIAorICAgICAgICBMT0co UmVzb3VyY2VMb2FkaW5nLCAiIGxydSBsaXN0IChzaXplICVsdSkgLSBmbHVzaGluZyBzdGFnZSIs IGxydUxpc3Quc2l6ZSgpKTsKKwogICAgICAgICAvLyBGaXJzdCBmbHVzaCBhbGwgdGhlIGRlY29k ZWQgZGF0YSBpbiB0aGlzIHF1ZXVlLgogICAgICAgICAvLyBSZW1vdmUgZnJvbSB0aGUgaGVhZCwg c2luY2UgdGhpcyBpcyB0aGUgbGVhc3QgZnJlcXVlbnRseSBhY2Nlc3NlZCBvZiB0aGUgb2JqZWN0 cy4KICAgICAgICAgZm9yIChhdXRvJiByZXNvdXJjZSA6IGxydUxpc3QpIHsKKyAgICAgICAgICAg IExPRyhSZXNvdXJjZUxvYWRpbmcsICIgbHJ1IHJlc291cmNlICVwIC0gaW4gY2FjaGUgJWQsIGhh cyBjbGllbnRzICVkLCBwcmVsb2FkZWQgJWQsIGxvYWRlZCAlZCIsIHJlc291cmNlLCByZXNvdXJj ZS0+aW5DYWNoZSgpLCByZXNvdXJjZS0+aGFzQ2xpZW50cygpLCByZXNvdXJjZS0+aXNQcmVsb2Fk ZWQoKSwgcmVzb3VyY2UtPmlzTG9hZGVkKCkpOwogICAgICAgICAgICAgaWYgKCFyZXNvdXJjZS0+ aW5DYWNoZSgpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCkBAIC0zNzUsNiArMzkwLDkg QEAgdm9pZCBNZW1vcnlDYWNoZTo6cHJ1bmVEZWFkUmVzb3VyY2VzVG9TaXplKHVuc2lnbmVkIHRh cmdldFNpemUpCiAgICAgICAgICAgICAgICAgLy8gRGVzdHJveSBvdXIgZGVjb2RlZCBkYXRhLiBU aGlzIHdpbGwgcmVtb3ZlIHVzIGZyb20gCiAgICAgICAgICAgICAgICAgLy8gbV9saXZlRGVjb2Rl ZFJlc291cmNlcywgYW5kIHBvc3NpYmx5IG1vdmUgdXMgdG8gYSBkaWZmZXJlbnQgCiAgICAgICAg ICAgICAgICAgLy8gTFJVIGxpc3QgaW4gbV9hbGxSZXNvdXJjZXMuCisKKyAgICAgICAgICAgICAg ICBMT0coUmVzb3VyY2VMb2FkaW5nLCAiIGxydSByZXNvdXJjZSAlcCBkZXN0cm95RGVjb2RlZERh dGEiLCByZXNvdXJjZSk7CisKICAgICAgICAgICAgICAgICByZXNvdXJjZS0+ZGVzdHJveURlY29k ZWREYXRhKCk7CiAKICAgICAgICAgICAgICAgICBpZiAodGFyZ2V0U2l6ZSAmJiBtX2RlYWRTaXpl IDw9IHRhcmdldFNpemUpCkBAIC0zODIsOSArNDAwLDEyIEBAIHZvaWQgTWVtb3J5Q2FjaGU6OnBy dW5lRGVhZFJlc291cmNlc1RvU2l6ZSh1bnNpZ25lZCB0YXJnZXRTaXplKQogICAgICAgICAgICAg fQogICAgICAgICB9CiAKKyAgICAgICAgTE9HKFJlc291cmNlTG9hZGluZywgIiBscnUgbGlzdCAo c2l6ZSAlbHUpIC0gZXZpY3Rpb24gc3RhZ2UiLCBscnVMaXN0LnNpemUoKSk7CisKICAgICAgICAg Ly8gTm93IGV2aWN0IG9iamVjdHMgZnJvbSB0aGlzIGxpc3QuCiAgICAgICAgIC8vIFJlbW92ZSBm cm9tIHRoZSBoZWFkLCBzaW5jZSB0aGlzIGlzIHRoZSBsZWFzdCBmcmVxdWVudGx5IGFjY2Vzc2Vk IG9mIHRoZSBvYmplY3RzLgogICAgICAgICBmb3IgKGF1dG8mIHJlc291cmNlIDogbHJ1TGlzdCkg eworICAgICAgICAgICAgTE9HKFJlc291cmNlTG9hZGluZywgIiBscnUgcmVzb3VyY2UgJXAgLSBp biBjYWNoZSAlZCwgaGFzIGNsaWVudHMgJWQsIHByZWxvYWRlZCAlZCwgbG9hZGVkICVkIiwgcmVz b3VyY2UsIHJlc291cmNlLT5pbkNhY2hlKCksIHJlc291cmNlLT5oYXNDbGllbnRzKCksIHJlc291 cmNlLT5pc1ByZWxvYWRlZCgpLCByZXNvdXJjZS0+aXNMb2FkZWQoKSk7CiAgICAgICAgICAgICBp ZiAoIXJlc291cmNlLT5pbkNhY2hlKCkpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKQEAg LTQxNyw3ICs0MzgsNyBAQCB2b2lkIE1lbW9yeUNhY2hlOjpzZXRDYXBhY2l0aWVzKHVuc2lnbmVk IG1pbkRlYWRCeXRlcywgdW5zaWduZWQgbWF4RGVhZEJ5dGVzLCB1bgogdm9pZCBNZW1vcnlDYWNo ZTo6cmVtb3ZlKENhY2hlZFJlc291cmNlJiByZXNvdXJjZSkKIHsKICAgICBBU1NFUlQoV1RGOjpp c01haW5UaHJlYWQoKSk7Ci0gICAgTE9HKFJlc291cmNlTG9hZGluZywgIkV2aWN0aW5nIHJlc291 cmNlICVwIGZvciAnJXMnIGZyb20gY2FjaGUiLCAmcmVzb3VyY2UsIHJlc291cmNlLnVybCgpLnN0 cmluZygpLmxhdGluMSgpLmRhdGEoKSk7CisgICAgTE9HKFJlc291cmNlTG9hZGluZywgIkV2aWN0 aW5nIHJlc291cmNlICVwIGZvciAnJS4yNTVzJyBmcm9tIGNhY2hlIiwgJnJlc291cmNlLCByZXNv dXJjZS51cmwoKS5zdHJpbmcoKS5sYXRpbjEoKS5kYXRhKCkpOwogICAgIC8vIFRoZSByZXNvdXJj ZSBtYXkgaGF2ZSBhbHJlYWR5IGJlZW4gcmVtb3ZlZCBieSBzb21lb25lIG90aGVyIHRoYW4gb3Vy IGNhbGxlciwKICAgICAvLyB3aG8gbmVlZGVkIGEgZnJlc2ggY29weSBmb3IgYSByZWxvYWQuIFNl ZSA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NzkjYzY+LgogICAg IGlmIChhdXRvKiByZXNvdXJjZXMgPSBzZXNzaW9uUmVzb3VyY2VNYXAocmVzb3VyY2Uuc2Vzc2lv bklEKCkpKSB7CkBAIC00MzYsOCArNDU3LDEwIEBAIHZvaWQgTWVtb3J5Q2FjaGU6OnJlbW92ZShD YWNoZWRSZXNvdXJjZSYgcmVzb3VyY2UpCiAgICAgICAgICAgICByZW1vdmVGcm9tTFJVTGlzdChy ZXNvdXJjZSk7CiAgICAgICAgICAgICByZW1vdmVGcm9tTGl2ZURlY29kZWRSZXNvdXJjZXNMaXN0 KHJlc291cmNlKTsKICAgICAgICAgICAgIGFkanVzdFNpemUocmVzb3VyY2UuaGFzQ2xpZW50cygp LCAtc3RhdGljX2Nhc3Q8bG9uZyBsb25nPihyZXNvdXJjZS5zaXplKCkpKTsKLSAgICAgICAgfSBl bHNlCisgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBBU1NFUlQocmVzb3VyY2VzLT5nZXQo a2V5KSAhPSAmcmVzb3VyY2UpOworICAgICAgICAgICAgTE9HKFJlc291cmNlTG9hZGluZywgIiAg cmVzb3VyY2UgJXAgaXMgbm90IGluIGNhY2hlIiwgJnJlc291cmNlKTsKKyAgICAgICAgfQogICAg IH0KIAogICAgIHJlc291cmNlLmRlbGV0ZUlmUG9zc2libGUoKTsKQEAgLTc4MCw3ICs4MDMsNyBA QCB2b2lkIE1lbW9yeUNhY2hlOjpkdW1wTFJVTGlzdHMoYm9vbCBpbmNsdWRlTGl2ZSkgY29uc3QK ICAgICAgICAgV1RGTG9nQWx3YXlzKCJcbkxpc3QgJWQ6XG4iLCBpKTsKICAgICAgICAgZm9yIChh dXRvKiByZXNvdXJjZSA6ICptX2FsbFJlc291cmNlc1tpXSkgewogICAgICAgICAgICAgaWYgKGlu Y2x1ZGVMaXZlIHx8ICFyZXNvdXJjZS0+aGFzQ2xpZW50cygpKQotICAgICAgICAgICAgICAgIFdU RkxvZ0Fsd2F5cygiICAlLjEwMHMgJS4xZkssICUuMWZLLCBhY2Nlc3NlczogJXUsIGNsaWVudHM6 ICVkXG4iLCByZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgcmVzb3VyY2Ut PmRlY29kZWRTaXplKCkgLyAxMDI0LjBmLCAocmVzb3VyY2UtPmVuY29kZWRTaXplKCkgKyByZXNv dXJjZS0+b3ZlcmhlYWRTaXplKCkpIC8gMTAyNC4wZiwgcmVzb3VyY2UtPmFjY2Vzc0NvdW50KCks IHJlc291cmNlLT5udW1iZXJPZkNsaWVudHMoKSk7CisgICAgICAgICAgICAgICAgV1RGTG9nQWx3 YXlzKCIgICVwICUuMjU1cyAlLjFmSywgJS4xZkssIGFjY2Vzc2VzOiAldSwgY2xpZW50czogJWRc biIsIHJlc291cmNlLCByZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgcmVz b3VyY2UtPmRlY29kZWRTaXplKCkgLyAxMDI0LjBmLCAocmVzb3VyY2UtPmVuY29kZWRTaXplKCkg KyByZXNvdXJjZS0+b3ZlcmhlYWRTaXplKCkpIC8gMTAyNC4wZiwgcmVzb3VyY2UtPmFjY2Vzc0Nv dW50KCksIHJlc291cmNlLT5udW1iZXJPZkNsaWVudHMoKSk7CiAgICAgICAgIH0KICAgICB9CiB9 Cg==