140701 2015-01-20 16:26:31 -0800 Simplify DiagnosticLoggingClient call sites 2015-01-20 18:16:48 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 140463 1 cdumez cdumez commit-queue jer.noble kling oldest_to_newest 1062930 0 cdumez 2015-01-20 16:26:31 -0800 Simplify DiagnosticLoggingClient call sites by: - Moving the Settings::diagnosticLoggingEnabled() check inside the MainFrame::diagnosticLoggingClient() getter - Having MainFrame::diagnosticLoggingClient() return a reference instead of a pointer (returning a dummy client if necessary) Otherwise, each call site needs to both check the setting and do a null-check on the client which is a bit annoying. 1062935 1 245033 cdumez 2015-01-20 16:30:05 -0800 Created attachment 245033 Patch 1062960 2 245033 kling 2015-01-20 17:31:22 -0800 Comment on attachment 245033 Patch r=me 1062969 3 245033 commit-queue 2015-01-20 18:16:42 -0800 Comment on attachment 245033 Patch Clearing flags on attachment: 245033 Committed r178794: <http://trac.webkit.org/changeset/178794> 1062970 4 commit-queue 2015-01-20 18:16:48 -0800 All reviewed patches have been landed. Closing bug. 245033 2015-01-20 16:30:05 -0800 2015-01-20 18:16:42 -0800 Patch bug-140701-20150120163012.patch text/plain 17128 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY0ZDAxZTQ4ZWI3YTE0 ZWE3OWYzOWJhMmZhOTZiYzI3MmZlMjFiNi4uYzBjZWU1Yzg3NzRlM2E2ZjYxYTEzYjQzOGEzMTRj ZDA5YjJiODNiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE1LTAxLTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgRGlhZ25vc3Rp Y0xvZ2dpbmdDbGllbnQgY2FsbCBzaXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQwNzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU2ltcGxpZnkgRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQgY2FsbCBz aXRlcyBieToKKyAgICAgICAgLSBNb3ZpbmcgdGhlIFNldHRpbmdzOjpkaWFnbm9zdGljTG9nZ2lu Z0VuYWJsZWQoKSBjaGVjayBpbnNpZGUgdGhlCisgICAgICAgICAgTWFpbkZyYW1lOjpkaWFnbm9z dGljTG9nZ2luZ0NsaWVudCgpIGdldHRlci4KKyAgICAgICAgLSBIYXZpbmcgTWFpbkZyYW1lOjpk aWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpIHJldHVybiBhIHJlZmVyZW5jZQorICAgICAgICAgIGlu c3RlYWQgb2YgYSBwb2ludGVyIChyZXR1cm5pbmcgYSBkdW1teSBjbGllbnQgaWYgbmVjZXNzYXJ5 KS4KKworICAgICAgICBPdGhlcndpc2UsIGVhY2ggY2FsbCBzaXRlIG5lZWRzIHRvIGJvdGggY2hl Y2sgdGhlIHNldHRpbmcgYW5kIGRvIGEKKyAgICAgICAgbnVsbC1jaGVjayBvbiB0aGUgY2xpZW50 IHdoaWNoIGlzIGEgYml0IGFubm95aW5nLgorCisgICAgICAgICogaGlzdG9yeS9QYWdlQ2FjaGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6bG9nUGFnZUNhY2hlRmFpbHVyZURpYWdub3N0aWNNZXNz YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OmxvZ0NhbkNhY2hlRnJhbWVEZWNpc2lvbik6CisgICAg ICAgIChXZWJDb3JlOjpsb2dDYW5DYWNoZVBhZ2VEZWNpc2lvbik6CisgICAgICAgICogaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6 OnBhcnNlQXR0cmlidXRlKToKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlDbGllbnRzLmg6CisgICAg ICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxvZ05hdmln YXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNoZWNrTG9hZENvbXBsZXRl Rm9yVGhpc0ZyYW1lKToKKyAgICAgICAgKiBsb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6bG9nUGx1Z2luUmVxdWVzdCk6CisgICAgICAgICogbG9hZGVyL1N1YnJl c291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxvZ1Jlc291cmNlTG9hZGVkKToK KyAgICAgICAgKiBwYWdlL0RpYWdub3N0aWNMb2dnaW5nQ2xpZW50Lmg6CisgICAgICAgIChXZWJD b3JlOjpEaWFnbm9zdGljTG9nZ2luZ0NsaWVudDo6bG9nRGlhZ25vc3RpY01lc3NhZ2UpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQ6OmxvZ0RpYWdu b3N0aWNNZXNzYWdlV2l0aFJlc3VsdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpEaWFn bm9zdGljTG9nZ2luZ0NsaWVudDo6bG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoVmFsdWUpOiBEZWxl dGVkLgorICAgICAgICAqIHBhZ2UvTWFpbkZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1h aW5GcmFtZTo6ZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQpOgorICAgICAgICAqIHBhZ2UvTWFpbkZy YW1lLmg6CisKIDIwMTUtMDEtMjAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBTaW1wbGUgbGluZSBsYXlvdXQ6IFVzZSBGbG93Q29udGVudHM6OlNlZ21lbnQ6OnRl eHQgaW5zdGVhZCBvZiByZW5kZXJlciB3aGVuIHBvc3NpYmxlLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9Q YWdlQ2FjaGUuY3BwCmluZGV4IGNmNjVjMGY4NjA4ZjllYmZhMmJjMzY5ZTYwNWQ3NzM0MTA0ZDMx NWYuLjMxYzk4NjFmMTdhNzAxMmEyMDZmNDkwYWIyYjg3ZDA4MTNmZWNiNzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFnZUNhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9oaXN0b3J5L1BhZ2VDYWNoZS5jcHAKQEAgLTk2LDEwICs5Niw5IEBAIGVudW0gUmVhc29uRnJh bWVDYW5ub3RCZUluUGFnZUNhY2hlIHsKIH07CiBDT01QSUxFX0FTU0VSVChOdW1iZXJPZlJlYXNv bnNGcmFtZXNDYW5ub3RCZUluUGFnZUNhY2hlIDw9IHNpemVvZih1bnNpZ25lZCkqOCwgUmVhc29u RnJhbWVDYW5ub3RCZUluUGFnZUNhY2hlRG9lc05vdEZpdEluQml0bWFwKTsKIAotc3RhdGljIGlu bGluZSB2b2lkIGxvZ1BhZ2VDYWNoZUZhaWx1cmVEaWFnbm9zdGljTWVzc2FnZShEaWFnbm9zdGlj TG9nZ2luZ0NsaWVudCogY2xpZW50LCBjb25zdCBTdHJpbmcmIHJlYXNvbikKK3N0YXRpYyBpbmxp bmUgdm9pZCBsb2dQYWdlQ2FjaGVGYWlsdXJlRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xv Z2dpbmdDbGllbnQmIGNsaWVudCwgY29uc3QgU3RyaW5nJiByZWFzb24pCiB7Ci0gICAgaWYgKGNs aWVudCkKLSAgICAgICAgY2xpZW50LT5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZShEaWFn bm9zdGljTG9nZ2luZ0tleXM6OnBhZ2VDYWNoZUtleSgpLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6 OmZhaWx1cmVLZXkoKSwgcmVhc29uKTsKKyAgICBjbGllbnQubG9nRGlhZ25vc3RpY01lc3NhZ2VX aXRoVmFsdWUoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ2FjaGVLZXkoKSwgRGlhZ25vc3Rp Y0xvZ2dpbmdLZXlzOjpmYWlsdXJlS2V5KCksIHJlYXNvbik7CiB9CiAKIHN0YXRpYyBpbmxpbmUg dm9pZCBsb2dQYWdlQ2FjaGVGYWlsdXJlRGlhZ25vc3RpY01lc3NhZ2UoUGFnZSogcGFnZSwgY29u c3QgU3RyaW5nJiByZWFzb24pCkBAIC0xMDcsMTIgKzEwNiwxMCBAQCBzdGF0aWMgaW5saW5lIHZv aWQgbG9nUGFnZUNhY2hlRmFpbHVyZURpYWdub3N0aWNNZXNzYWdlKFBhZ2UqIHBhZ2UsIGNvbnN0 IFN0cmluZwogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgTWFpbkZyYW1l JiBtYWluRnJhbWUgPSBwYWdlLT5tYWluRnJhbWUoKTsKLSAgICBpZiAobWFpbkZyYW1lLnNldHRp bmdzKCkuZGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVkKCkpCi0gICAgICAgIGxvZ1BhZ2VDYWNoZUZh aWx1cmVEaWFnbm9zdGljTWVzc2FnZShtYWluRnJhbWUuZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQo KSwgcmVhc29uKTsKKyAgICBsb2dQYWdlQ2FjaGVGYWlsdXJlRGlhZ25vc3RpY01lc3NhZ2UocGFn ZS0+bWFpbkZyYW1lKCkuZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKSwgcmVhc29uKTsKIH0KIAot c3RhdGljIHVuc2lnbmVkIGxvZ0NhbkNhY2hlRnJhbWVEZWNpc2lvbihGcmFtZSYgZnJhbWUsIERp YWdub3N0aWNMb2dnaW5nQ2xpZW50KiBkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCwgaW50IGluZGVu dExldmVsKQorc3RhdGljIHVuc2lnbmVkIGxvZ0NhbkNhY2hlRnJhbWVEZWNpc2lvbihGcmFtZSYg ZnJhbWUsIERpYWdub3N0aWNMb2dnaW5nQ2xpZW50JiBkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCwg aW50IGluZGVudExldmVsKQogewogICAgIFBDTE9HKCIrLS0tIik7CiAgICAgaWYgKCFmcmFtZS5s b2FkZXIoKS5kb2N1bWVudExvYWRlcigpKSB7CkBAIC0yNDEsNyArMjM4LDcgQEAgc3RhdGljIHZv aWQgbG9nQ2FuQ2FjaGVQYWdlRGVjaXNpb24oUGFnZSYgcGFnZSkKICAgICAKICAgICB1bnNpZ25l ZCByZWplY3RSZWFzb25zID0gMDsKICAgICBNYWluRnJhbWUmIG1haW5GcmFtZSA9IHBhZ2UubWFp bkZyYW1lKCk7Ci0gICAgRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQqIGRpYWdub3N0aWNMb2dnaW5n Q2xpZW50ID0gbWFpbkZyYW1lLnNldHRpbmdzKCkuZGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVkKCkg PyBtYWluRnJhbWUuZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKSA6IG51bGxwdHI7CisgICAgRGlh Z25vc3RpY0xvZ2dpbmdDbGllbnQmIGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50ID0gbWFpbkZyYW1l LmRpYWdub3N0aWNMb2dnaW5nQ2xpZW50KCk7CiAgICAgdW5zaWduZWQgZnJhbWVSZWplY3RSZWFz b25zID0gbG9nQ2FuQ2FjaGVGcmFtZURlY2lzaW9uKG1haW5GcmFtZSwgZGlhZ25vc3RpY0xvZ2dp bmdDbGllbnQsIGluZGVudExldmVsICsgMSk7CiAgICAgaWYgKGZyYW1lUmVqZWN0UmVhc29ucykK ICAgICAgICAgcmVqZWN0UmVhc29ucyB8PSAxIDw8IEZyYW1lQ2Fubm90QmVJblBhZ2VDYWNoZTsK QEAgLTI5MSw4ICsyODgsNyBAQCBzdGF0aWMgdm9pZCBsb2dDYW5DYWNoZVBhZ2VEZWNpc2lvbihQ YWdlJiBwYWdlKQogICAgIGVsc2UKICAgICAgICAgUENMT0coIiBQYWdlIENBTiBiZSBjYWNoZWRc bi0tLS0tLS0tIik7CiAKLSAgICBpZiAoZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQpCi0gICAgICAg IGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LT5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhSZXN1bHQo RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ2FjaGVLZXkoKSwgZW1wdHlTdHJpbmcoKSwgcmVq ZWN0UmVhc29ucyA/IERpYWdub3N0aWNMb2dnaW5nUmVzdWx0RmFpbCA6IERpYWdub3N0aWNMb2dn aW5nUmVzdWx0UGFzcyk7CisgICAgZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQubG9nRGlhZ25vc3Rp Y01lc3NhZ2VXaXRoUmVzdWx0KERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUNhY2hlS2V5KCks IGVtcHR5U3RyaW5nKCksIHJlamVjdFJlYXNvbnMgPyBEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdEZh aWwgOiBEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFBhc3MpOwogfQogCiBQYWdlQ2FjaGUqIHBhZ2VD YWNoZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCBlNGI4 YWNkYjA4ODZkMWMyYWYxODEwZTM5YTE0YmFmYzhjMWEzZjZhLi4xZmU3YjgxYjFlNjUzODJmZTI3 NjUyYjI5ZWMwNDA4NDk1YjZiYTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxl bWVudC5jcHAKQEAgLTE4MjksMjUgKzE4MjksMjIgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojpt ZWRpYVBsYXllck5ldHdvcmtTdGF0ZUNoYW5nZWQoTWVkaWFQbGF5ZXIqKQogCiBzdGF0aWMgdm9p ZCBsb2dNZWRpYUxvYWRSZXF1ZXN0KFBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYgbWVkaWFFbmdp bmUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlLCBib29sIHN1Y2NlZWRlZCkKIHsKLSAgICBp ZiAoIXBhZ2UgfHwgIXBhZ2UtPnNldHRpbmdzKCkuZGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVkKCkp Ci0gICAgICAgIHJldHVybjsKLQotICAgIERpYWdub3N0aWNMb2dnaW5nQ2xpZW50KiBkaWFnbm9z dGljTG9nZ2luZ0NsaWVudCA9IHBhZ2UtPm1haW5GcmFtZSgpLmRpYWdub3N0aWNMb2dnaW5nQ2xp ZW50KCk7Ci0gICAgaWYgKCFkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCkKKyAgICBpZiAoIXBhZ2Up CiAgICAgICAgIHJldHVybjsKIAorICAgIERpYWdub3N0aWNMb2dnaW5nQ2xpZW50JiBkaWFnbm9z dGljTG9nZ2luZ0NsaWVudCA9IHBhZ2UtPm1haW5GcmFtZSgpLmRpYWdub3N0aWNMb2dnaW5nQ2xp ZW50KCk7CiAgICAgaWYgKCFzdWNjZWVkZWQpIHsKLSAgICAgICAgZGlhZ25vc3RpY0xvZ2dpbmdD bGllbnQtPmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFJlc3VsdChEaWFnbm9zdGljTG9nZ2luZ0tl eXM6Om1lZGlhTG9hZGluZ0ZhaWxlZEtleSgpLCBlcnJvck1lc3NhZ2UsIERpYWdub3N0aWNMb2dn aW5nUmVzdWx0RmFpbCk7CisgICAgICAgIGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LmxvZ0RpYWdu b3N0aWNNZXNzYWdlV2l0aFJlc3VsdChEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om1lZGlhTG9hZGlu Z0ZhaWxlZEtleSgpLCBlcnJvck1lc3NhZ2UsIERpYWdub3N0aWNMb2dnaW5nUmVzdWx0RmFpbCk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBkaWFnbm9zdGljTG9nZ2luZ0NsaWVudC0+ bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptZWRpYUxvYWRlZEtl eSgpLCBtZWRpYUVuZ2luZSk7CisgICAgZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQubG9nRGlhZ25v c3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptZWRpYUxvYWRlZEtleSgpLCBtZWRp YUVuZ2luZSk7CiAKICAgICBpZiAoIXBhZ2UtPmhhc1NlZW5BbnlNZWRpYUVuZ2luZSgpKQotICAg ICAgICBkaWFnbm9zdGljTG9nZ2luZ0NsaWVudC0+bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25v c3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ29udGFpbnNBdExlYXN0T25lTWVkaWFFbmdpbmVLZXkoKSwg ZW1wdHlTdHJpbmcoKSk7CisgICAgICAgIGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LmxvZ0RpYWdu b3N0aWNNZXNzYWdlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUNvbnRhaW5zQXRMZWFzdE9u ZU1lZGlhRW5naW5lS2V5KCksIGVtcHR5U3RyaW5nKCkpOwogCiAgICAgaWYgKCFwYWdlLT5oYXNT ZWVuTWVkaWFFbmdpbmUobWVkaWFFbmdpbmUpKQotICAgICAgICBkaWFnbm9zdGljTG9nZ2luZ0Ns aWVudC0+bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ29u dGFpbnNNZWRpYUVuZ2luZUtleSgpLCBtZWRpYUVuZ2luZSk7CisgICAgICAgIGRpYWdub3N0aWNM b2dnaW5nQ2xpZW50LmxvZ0RpYWdub3N0aWNNZXNzYWdlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6 cGFnZUNvbnRhaW5zTWVkaWFFbmdpbmVLZXkoKSwgbWVkaWFFbmdpbmUpOwogCiAgICAgcGFnZS0+ c2F3TWVkaWFFbmdpbmUobWVkaWFFbmdpbmUpOwogfQpAQCAtNTc4NiwxNiArNTc4Myw4IEBAIHZv aWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJFbmdpbmVGYWlsZWRUb0xvYWQoKSBjb25z dAogICAgIGlmICghbV9wbGF5ZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIFBhZ2UqIHBhZ2Ug PSBkb2N1bWVudCgpLnBhZ2UoKTsKLSAgICBpZiAoIXBhZ2UgfHwgIXBhZ2UtPnNldHRpbmdzKCku ZGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVkKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIERpYWdu b3N0aWNMb2dnaW5nQ2xpZW50KiBkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCA9IHBhZ2UtPm1haW5G cmFtZSgpLmRpYWdub3N0aWNMb2dnaW5nQ2xpZW50KCk7Ci0gICAgaWYgKCFkaWFnbm9zdGljTG9n Z2luZ0NsaWVudCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgU3RyaW5nIGVuZ2luZSA9IG1fcGxh eWVyLT5lbmdpbmVEZXNjcmlwdGlvbigpOwotICAgIGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50LT5s b2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZShEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmVuZ2lu ZUZhaWxlZFRvTG9hZEtleSgpLCBlbmdpbmUsIFN0cmluZzo6bnVtYmVyKG1fcGxheWVyLT5wbGF0 Zm9ybUVycm9yQ29kZSgpKSk7CisgICAgaWYgKEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50KCkuZnJh bWUoKSkKKyAgICAgICAgZnJhbWUtPm1haW5GcmFtZSgpLmRpYWdub3N0aWNMb2dnaW5nQ2xpZW50 KCkubG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoVmFsdWUoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpl bmdpbmVGYWlsZWRUb0xvYWRLZXkoKSwgbV9wbGF5ZXItPmVuZ2luZURlc2NyaXB0aW9uKCksIFN0 cmluZzo6bnVtYmVyKG1fcGxheWVyLT5wbGF0Zm9ybUVycm9yQ29kZSgpKSk7CiB9CiAKIGRvdWJs ZSBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllclJlcXVlc3RlZFBsYXliYWNrUmF0ZSgpIGNv bnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmggYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKaW5kZXggNmE5M2Y3MmRiMmQ5Y2I2 YTU4ZGY5MGI1N2U4Mzg5YjExYjIzMmRiNS4uZGNjMzRkZGMzZjE1OWU2MjhkNjU3OWZhNDRmM2Yw YTYxYzlhZjQzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50 cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaApAQCAtNjMxLDcg KzYzMSw3IEBAIGNsYXNzIEVtcHR5UHJvZ3Jlc3NUcmFja2VyQ2xpZW50IDogcHVibGljIFByb2dy ZXNzVHJhY2tlckNsaWVudCB7CiAgICAgdmlydHVhbCB2b2lkIHByb2dyZXNzRmluaXNoZWQoRnJh bWUmKSBvdmVycmlkZSB7IH0KIH07CiAKLWNsYXNzIEVtcHR5RGlhZ25vc3RpY0xvZ2dpbmdDbGll bnQgOiBwdWJsaWMgRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQgeworY2xhc3MgRW1wdHlEaWFnbm9z dGljTG9nZ2luZ0NsaWVudCBmaW5hbCA6IHB1YmxpYyBEaWFnbm9zdGljTG9nZ2luZ0NsaWVudCB7 CiAgICAgdmlydHVhbCB2b2lkIGxvZ0RpYWdub3N0aWNNZXNzYWdlKGNvbnN0IFN0cmluZyYsIGNv bnN0IFN0cmluZyYpIG92ZXJyaWRlIHsgfQogICAgIHZpcnR1YWwgdm9pZCBsb2dEaWFnbm9zdGlj TWVzc2FnZVdpdGhSZXN1bHQoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgRGlhZ25vc3Rp Y0xvZ2dpbmdSZXN1bHRUeXBlKSBvdmVycmlkZSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgbG9nRGlh Z25vc3RpY01lc3NhZ2VXaXRoVmFsdWUoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgY29u c3QgU3RyaW5nJikgb3ZlcnJpZGUgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cAppbmRleCA3MDBjZjU0ZjFhZGFjZGM5ODllZjY4YWE3MDg5Mjg5YTZjNmMyYTUxLi4wMzc0NzM5 ZWM0NmJkOGRiOTRkZDUxYjQxM2QwMzZjMmM2YjZiOTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKQEAgLTE0MDAsMTAgKzE0MDAsNyBAQCBzdGF0aWMgdm9pZCBsb2dOYXZp Z2F0aW9uKE1haW5GcmFtZSYgZnJhbWUsIEZyYW1lTG9hZFR5cGUgdHlwZSkKICAgICAgICAgLy8g Tm90IGxvZ2dpbmcgdGhvc2UgZm9yIG5vdy4KICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBp ZiAoZnJhbWUuc2V0dGluZ3MoKS5kaWFnbm9zdGljTG9nZ2luZ0VuYWJsZWQoKSkgewotICAgICAg ICBpZiAoYXV0byogY2xpZW50ID0gZnJhbWUuZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKSkKLSAg ICAgICAgICAgIGNsaWVudC0+bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdL ZXlzOjpuYXZpZ2F0aW9uS2V5KCksIG5hdmlnYXRpb25EZXNjcmlwdGlvbik7Ci0gICAgfQorICAg IGZyYW1lLmRpYWdub3N0aWNMb2dnaW5nQ2xpZW50KCkubG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlh Z25vc3RpY0xvZ2dpbmdLZXlzOjpuYXZpZ2F0aW9uS2V5KCksIG5hdmlnYXRpb25EZXNjcmlwdGlv bik7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRXaXRoRG9jdW1lbnRMb2FkZXIoRG9jdW1l bnRMb2FkZXIqIGxvYWRlciwgRnJhbWVMb2FkVHlwZSB0eXBlLCBQYXNzUmVmUHRyPEZvcm1TdGF0 ZT4gcHJwRm9ybVN0YXRlLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwgYWxsb3dOYXZpZ2F0 aW9uVG9JbnZhbGlkVVJMKQpAQCAtMjI3NywxNCArMjI3NCw4IEBAIHZvaWQgRnJhbWVMb2FkZXI6 OmNoZWNrTG9hZENvbXBsZXRlRm9yVGhpc0ZyYW1lKCkKICAgICAgICAgICAgIGlmIChBWE9iamVj dENhY2hlKiBjYWNoZSA9IG1fZnJhbWUuZG9jdW1lbnQoKS0+ZXhpc3RpbmdBWE9iamVjdENhY2hl KCkpCiAgICAgICAgICAgICAgICAgY2FjaGUtPmZyYW1lTG9hZGluZ0V2ZW50Tm90aWZpY2F0aW9u KCZtX2ZyYW1lLCBsb2FkaW5nRXZlbnQpOwogCi0gICAgICAgICAgICBpZiAoIXBhZ2UgfHwgIXBh Z2UtPnNldHRpbmdzKCkuZGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVkKCkpCi0gICAgICAgICAgICAg ICAgcmV0dXJuOwotCi0gICAgICAgICAgICBEaWFnbm9zdGljTG9nZ2luZ0NsaWVudCogZGlhZ25v c3RpY0xvZ2dpbmdDbGllbnQgPSBwYWdlLT5tYWluRnJhbWUoKS5kaWFnbm9zdGljTG9nZ2luZ0Ns aWVudCgpOwotICAgICAgICAgICAgaWYgKCFkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCkKLSAgICAg ICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgICAgIGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50 LT5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhSZXN1bHQoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpw YWdlTG9hZGVkS2V5KCksIGVtcHR5U3RyaW5nKCksIGVycm9yLmlzTnVsbCgpID8gRGlhZ25vc3Rp Y0xvZ2dpbmdSZXN1bHRQYXNzIDogRGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRGYWlsKTsKKyAgICAg ICAgICAgIGlmIChwYWdlKQorICAgICAgICAgICAgICAgIHBhZ2UtPm1haW5GcmFtZSgpLmRpYWdu b3N0aWNMb2dnaW5nQ2xpZW50KCkubG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoUmVzdWx0KERpYWdu b3N0aWNMb2dnaW5nS2V5czo6cGFnZUxvYWRlZEtleSgpLCBlbXB0eVN0cmluZygpLCBlcnJvci5p c051bGwoKSA/IERpYWdub3N0aWNMb2dnaW5nUmVzdWx0UGFzcyA6IERpYWdub3N0aWNMb2dnaW5n UmVzdWx0RmFpbCk7CiAKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKaW5kZXggM2EyNjBkN2Q0MzI5YjljNjk4MTBh MDQ1NDIwY2U2ZTFkZGNiMTYxZi4uNWVjZmM3MDg4ODhjMTdjMjAzMDAwNzM0Mjc1MTVkMWFhMmRi MWFkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCkBAIC0xODAs NyArMTgwLDcgQEAgc3RhdGljIFN0cmluZyBmaW5kUGx1Z2luTUlNRVR5cGVGcm9tVVJMKFBhZ2Uq IHBhZ2UsIGNvbnN0IFN0cmluZyYgdXJsKQogCiBzdGF0aWMgdm9pZCBsb2dQbHVnaW5SZXF1ZXN0 KFBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFN0cmluZyYgdXJsLCBi b29sIHN1Y2Nlc3MpCiB7Ci0gICAgaWYgKCFwYWdlIHx8ICFwYWdlLT5zZXR0aW5ncygpLmRpYWdu b3N0aWNMb2dnaW5nRW5hYmxlZCgpKQorICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuOwog CiAgICAgU3RyaW5nIG5ld01JTUVUeXBlID0gbWltZVR5cGU7CkBAIC0xOTQsMTcgKzE5NCwxNCBA QCBzdGF0aWMgdm9pZCBsb2dQbHVnaW5SZXF1ZXN0KFBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYg bWltZVR5cGUsIGNvbnN0IFN0cmluZyYgdQogICAgIFN0cmluZyBwbHVnaW5GaWxlID0gcGFnZS0+ cGx1Z2luRGF0YSgpLnBsdWdpbkZpbGVGb3JNaW1lVHlwZShuZXdNSU1FVHlwZSk7CiAgICAgU3Ry aW5nIGRlc2NyaXB0aW9uID0gIXBsdWdpbkZpbGUgPyBuZXdNSU1FVHlwZSA6IHBsdWdpbkZpbGU7 CiAKLSAgICBEaWFnbm9zdGljTG9nZ2luZ0NsaWVudCogZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQg PSBwYWdlLT5tYWluRnJhbWUoKS5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpOwotICAgIGlmICgh ZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQpCi0gICAgICAgIHJldHVybjsKLQotICAgIGRpYWdub3N0 aWNMb2dnaW5nQ2xpZW50LT5sb2dEaWFnbm9zdGljTWVzc2FnZShzdWNjZXNzID8gRGlhZ25vc3Rp Y0xvZ2dpbmdLZXlzOjpwbHVnaW5Mb2FkZWRLZXkoKSA6IERpYWdub3N0aWNMb2dnaW5nS2V5czo6 cGx1Z2luTG9hZGluZ0ZhaWxlZEtleSgpLCBkZXNjcmlwdGlvbik7CisgICAgRGlhZ25vc3RpY0xv Z2dpbmdDbGllbnQmIGRpYWdub3N0aWNMb2dnaW5nQ2xpZW50ID0gcGFnZS0+bWFpbkZyYW1lKCku ZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKTsKKyAgICBkaWFnbm9zdGljTG9nZ2luZ0NsaWVudC5s b2dEaWFnbm9zdGljTWVzc2FnZShzdWNjZXNzID8gRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwbHVn aW5Mb2FkZWRLZXkoKSA6IERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGx1Z2luTG9hZGluZ0ZhaWxl ZEtleSgpLCBkZXNjcmlwdGlvbik7CiAKICAgICBpZiAoIXBhZ2UtPmhhc1NlZW5BbnlQbHVnaW4o KSkKLSAgICAgICAgZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQtPmxvZ0RpYWdub3N0aWNNZXNzYWdl KERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUNvbnRhaW5zQXRMZWFzdE9uZVBsdWdpbktleSgp LCBlbXB0eVN0cmluZygpKTsKKyAgICAgICAgZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQubG9nRGlh Z25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ29udGFpbnNBdExlYXN0 T25lUGx1Z2luS2V5KCksIGVtcHR5U3RyaW5nKCkpOwogCiAgICAgaWYgKCFwYWdlLT5oYXNTZWVu UGx1Z2luKGRlc2NyaXB0aW9uKSkKLSAgICAgICAgZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQtPmxv Z0RpYWdub3N0aWNNZXNzYWdlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUNvbnRhaW5zUGx1 Z2luS2V5KCksIGRlc2NyaXB0aW9uKTsKKyAgICAgICAgZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQu bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwYWdlQ29udGFpbnNQ bHVnaW5LZXkoKSwgZGVzY3JpcHRpb24pOwogCiAgICAgcGFnZS0+c2F3UGx1Z2luKGRlc2NyaXB0 aW9uKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxv YWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCmlu ZGV4IGFkNGE1MjQ4NmUwMjEzMzVhYjEyYmE2YWE2NzBiZjEzZDUwMjkzMzUuLmZkOTQ0NTdhZmIz YmQ2OTNlMzIxY2YwNjQ5ODkyMWIwY2Q5MmM3NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L1N1YnJlc291cmNlTG9hZGVyLmNwcApAQCAtMjk4LDcgKzI5OCw3IEBAIGJvb2wgU3VicmVzb3Vy Y2VMb2FkZXI6OmNoZWNrRm9ySFRUUFN0YXR1c0NvZGVFcnJvcigpCiAKIHN0YXRpYyB2b2lkIGxv Z1Jlc291cmNlTG9hZGVkKEZyYW1lKiBmcmFtZSwgQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSkK IHsKLSAgICBpZiAoIWZyYW1lIHx8ICFmcmFtZS0+c2V0dGluZ3MoKS5kaWFnbm9zdGljTG9nZ2lu Z0VuYWJsZWQoKSkKKyAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm47CiAKICAgICBTdHJp bmcgcmVzb3VyY2VUeXBlOwpAQCAtMzQwLDggKzM0MCw3IEBAIHN0YXRpYyB2b2lkIGxvZ1Jlc291 cmNlTG9hZGVkKEZyYW1lKiBmcmFtZSwgQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSkKICAgICAg ICAgcmVzb3VyY2VUeXBlID0gRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpvdGhlcktleSgpOwogICAg ICAgICBicmVhazsKICAgICB9Ci0gICAgaWYgKGF1dG8qIGNsaWVudCA9IGZyYW1lLT5tYWluRnJh bWUoKS5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpKQotICAgICAgICBjbGllbnQtPmxvZ0RpYWdu b3N0aWNNZXNzYWdlV2l0aFZhbHVlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6cmVzb3VyY2VLZXko KSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpsb2FkZWRLZXkoKSwgcmVzb3VyY2VUeXBlKTsKKyAg ICBmcmFtZS0+bWFpbkZyYW1lKCkuZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKS5sb2dEaWFnbm9z dGljTWVzc2FnZVdpdGhWYWx1ZShEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnJlc291cmNlS2V5KCks IERpYWdub3N0aWNMb2dnaW5nS2V5czo6bG9hZGVkS2V5KCksIHJlc291cmNlVHlwZSk7CiB9CiAK IHZvaWQgU3VicmVzb3VyY2VMb2FkZXI6OmRpZEZpbmlzaExvYWRpbmcoZG91YmxlIGZpbmlzaFRp bWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nQ2xp ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nQ2xpZW50LmgKaW5k ZXggY2YyZjE4OTI0MzVmZmE2ZTJmZTU2ZWVkOWJhYWI0OWIxZDFlYmI3NS4uYTBkYTg1ZGUwYTYw M2NkMDhjMDNlMWQ0MDg3ZGU4OTEyMTRjZGIzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9EaWFnbm9zdGljTG9nZ2luZ0NsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQuaApAQCAtMzMsOSArMzMsOSBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKIGNsYXNzIERpYWdub3N0aWNMb2dnaW5nQ2xpZW50IHsKIHB1YmxpYzoKLSAgICB2 aXJ0dWFsIHZvaWQgbG9nRGlhZ25vc3RpY01lc3NhZ2UoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBj b25zdCBTdHJpbmcmIGRlc2NyaXB0aW9uKSB7IFVOVVNFRF9QQVJBTShtZXNzYWdlKTsgVU5VU0VE X1BBUkFNKGRlc2NyaXB0aW9uKTsgfQotICAgIHZpcnR1YWwgdm9pZCBsb2dEaWFnbm9zdGljTWVz c2FnZVdpdGhSZXN1bHQoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGRlc2Ny aXB0aW9uLCBEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFR5cGUpIHsgVU5VU0VEX1BBUkFNKG1lc3Nh Z2UpOyBVTlVTRURfUEFSQU0oZGVzY3JpcHRpb24pOyB9Ci0gICAgdmlydHVhbCB2b2lkIGxvZ0Rp YWdub3N0aWNNZXNzYWdlV2l0aFZhbHVlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3Ry aW5nJiBkZXNjcmlwdGlvbiwgY29uc3QgU3RyaW5nJiB2YWx1ZSkgeyBVTlVTRURfUEFSQU0obWVz c2FnZSk7IFVOVVNFRF9QQVJBTShkZXNjcmlwdGlvbik7IFVOVVNFRF9QQVJBTSh2YWx1ZSk7IH0K KyAgICB2aXJ0dWFsIHZvaWQgbG9nRGlhZ25vc3RpY01lc3NhZ2UoY29uc3QgU3RyaW5nJiBtZXNz YWdlLCBjb25zdCBTdHJpbmcmIGRlc2NyaXB0aW9uKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGxv Z0RpYWdub3N0aWNNZXNzYWdlV2l0aFJlc3VsdChjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0 IFN0cmluZyYgZGVzY3JpcHRpb24sIERpYWdub3N0aWNMb2dnaW5nUmVzdWx0VHlwZSkgPSAwOwor ICAgIHZpcnR1YWwgdm9pZCBsb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZShjb25zdCBTdHJp bmcmIG1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgZGVzY3JpcHRpb24sIGNvbnN0IFN0cmluZyYgdmFs dWUpID0gMDsKIAogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgfkRpYWdub3N0aWNMb2dnaW5nQ2xp ZW50KCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL01haW5GcmFtZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL01haW5GcmFtZS5jcHAKaW5kZXggZmRhMTE4MzA5Y2EyNzAx NWQzZWVjNGFkMWU5ZmZiYzVhZjc2MTZmZS4uODczMjMwMWRmMjU1ZTI0ZDRiMzMzZDQzYjMwNjc4 YzNmZjhmNWUxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9NYWluRnJhbWUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTWFpbkZyYW1lLmNwcApAQCAtMjcsMTAgKzI3LDEz IEBACiAjaW5jbHVkZSAiTWFpbkZyYW1lLmgiCiAKICNpbmNsdWRlICJFbGVtZW50LmgiCisjaW5j bHVkZSAiRW1wdHlDbGllbnRzLmgiCiAjaW5jbHVkZSAiUGFnZUNvbmZpZ3VyYXRpb24uaCIKICNp bmNsdWRlICJQYWdlT3ZlcmxheUNvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJTY3JvbGxMYXRjaGlu Z1N0YXRlLmgiCisjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJXaGVlbEV2ZW50RGVs dGFUcmFja2VyLmgiCisjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAKICNpZiBQTEFU Rk9STShNQUMpCiAjaW5jbHVkZSAiU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5oIgpAQCAtODEs NiArODQsMTUgQEAgdm9pZCBNYWluRnJhbWU6OnNlbGZPbmx5RGVyZWYoKQogICAgIGRlcmVmKCk7 CiB9CiAKK0RpYWdub3N0aWNMb2dnaW5nQ2xpZW50JiBNYWluRnJhbWU6OmRpYWdub3N0aWNMb2dn aW5nQ2xpZW50KCkgY29uc3QKK3sKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8RW1wdHlEaWFn bm9zdGljTG9nZ2luZ0NsaWVudD4gZHVtbXlDbGllbnQ7CisgICAgaWYgKCFzZXR0aW5ncygpLmRp YWdub3N0aWNMb2dnaW5nRW5hYmxlZCgpIHx8ICFtX2RpYWdub3N0aWNMb2dnaW5nQ2xpZW50KQor ICAgICAgICByZXR1cm4gZHVtbXlDbGllbnQ7CisKKyAgICByZXR1cm4gKm1fZGlhZ25vc3RpY0xv Z2dpbmdDbGllbnQ7Cit9CisKIHZvaWQgTWFpbkZyYW1lOjpkcm9wQ2hpbGRyZW4oKQogewogICAg IHdoaWxlIChGcmFtZSogY2hpbGQgPSB0cmVlKCkuZmlyc3RDaGlsZCgpKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9NYWluRnJhbWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvTWFp bkZyYW1lLmgKaW5kZXggMzFkODg1MmU5OGNlMDBjOGMxZDdkM2EyZDllZTIyYmE0NWM3OWYwMS4u ZWM3NzQ0NmQzZjBmMzEyY2FhYzA1N2RmZmNhMzlkOTZlZGY2YjkyOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9NYWluRnJhbWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL01h aW5GcmFtZS5oCkBAIC02MSw3ICs2MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlc2V0TGF0Y2hp bmdTdGF0ZSgpOwogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAotICAgIERpYWdub3N0aWNMb2dn aW5nQ2xpZW50KiBkaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZGlh Z25vc3RpY0xvZ2dpbmdDbGllbnQ7IH0KKyAgICBEaWFnbm9zdGljTG9nZ2luZ0NsaWVudCYgZGlh Z25vc3RpY0xvZ2dpbmdDbGllbnQoKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBNYWluRnJhbWUo UGFnZSYsIFBhZ2VDb25maWd1cmF0aW9uJik7Cg==