50289 2010-11-30 16:27:11 -0800 Make ProgressEvent 64-bit instead of 32-bit 2010-11-30 17:28:13 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 darin darin oldest_to_newest 315386 0 darin 2010-11-30 16:27:11 -0800 Make ProgressEvent 64-bit instead of 32-bit 315428 1 75235 darin 2010-11-30 17:10:55 -0800 Created attachment 75235 Patch 315429 2 darin 2010-11-30 17:11:33 -0800 <rdar://problem/8707465> 315437 3 75235 ap 2010-11-30 17:18:28 -0800 Comment on attachment 75235 Patch + Made constant have internal linkage. This is not accurate - they already have internal linkage. The only difference between "const" and "static const" is that the latter would get offended if there were a previous declaration, e.g. in header. r=me 315441 4 darin 2010-11-30 17:28:13 -0800 Committed r72985: <http://trac.webkit.org/changeset/72985> 75235 2010-11-30 17:10:55 -0800 2010-11-30 17:18:28 -0800 Patch bug-50289-20101130171054.patch text/plain 21621 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3Mjk3NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTggQEAKKzIwMTAtMTEtMzAgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2Ug UHJvZ3Jlc3NFdmVudCA2NC1iaXQgaW5zdGVhZCBvZiAzMi1iaXQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMjg5CisKKyAgICAgICAgKiBkb20vUHJv Z3Jlc3NFdmVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9ncmVzc0V2ZW50OjpQcm9ncmVz c0V2ZW50KTogQ2hhbmdlZCBhcmd1bWVudHMgdG8gdW5zaWduZWQgbG9uZyBsb25nLgorICAgICAg ICAoV2ViQ29yZTo6UHJvZ3Jlc3NFdmVudDo6aW5pdFByb2dyZXNzRXZlbnQpOiBEaXR0by4KKwor ICAgICAgICAqIGRvbS9Qcm9ncmVzc0V2ZW50Lmg6IEZpeGVkIGZvcm1hdHRpbmcuIENoYW5nZWQg dHlwZXMgdG8gdW5zaWduZWQgbG9uZyBsb25nLgorICAgICAgICBNYWRlIGlzUHJvZ3Jlc3NFdmVu dCBvdmVycmlkZSBwcml2YXRlLgorCisgICAgICAgICogZG9tL1Byb2dyZXNzRXZlbnQuaWRsOiBU d2Vha2VkIGZvcm1hdHRpbmcgYW5kIGNoYW5nZWQgdHlwZXMgdG8gdW5zaWduZWQgbG9uZyBsb25n LgorCisgICAgICAgICogZmlsZWFwaS9GaWxlUmVhZGVyLmNwcDogUmVtb3ZlZCB1bm5lZWRlZCBp bmNsdWRlcy4KKyAgICAgICAgTWFkZSBjb25zdGFudCBoYXZlIGludGVybmFsIGxpbmthZ2UuCisg ICAgICAgIChXZWJDb3JlOjpGaWxlUmVhZGVyOjpkaWRSZWNlaXZlRGF0YSk6IFJlbW92ZWQgdW5u ZWVkZWQgV1RGIHByZWZpeC4KKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXI6OmZpcmVFdmVu dCk6IEdvdCByaWQgb2YgbG9jYWwgdmFyaWFibGVzIHRoYXQgd291bGQgbmFycm93CisgICAgICAg IGJ5dGVzIGxvYWRlZCBhbmQgdG90YWwgYnl0ZXMgdG8gMzItYml0LgorCisgICAgICAgICogZmls ZWFwaS9GaWxlUmVhZGVyTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXJM b2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZSk6IFJlc3RydWN0dXJlZCBjb2RlIGEgYml0IGFuZAor ICAgICAgICBhZGRlZCBjb21tZW50cy4gQWxzbyBhZGRlZCBoYW5kbGluZyBmb3Igd2hlbiBBcnJh eUJ1ZmZlcjo6Y3JlYXRlIHJldHVybnMgMC4KKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXJM b2FkZXI6OmRpZFJlY2VpdmVEYXRhKTogRml4ZWQgaGFuZGxpbmcgb2YgY2FzZSB3aGVyZSBtb3Jl CisgICAgICAgIGRhdGEgYXJyaXZlcyB0aGFuIGlzIGV4cGVjdGVkIHNvIGl0IHdvbid0IG92ZXJy dW4gdGhlIGJ1ZmZlci4gQWxzbyBicm9rZSBhbgorICAgICAgICBhc3NlcnRpb24gaW50byB0d28g YW5kIGltcHJvdmVkIGEgY29tbWVudC4KKworICAgICAgICAqIGZpbGVhcGkvRmlsZVJlYWRlckxv YWRlci5oOiBDaGFuZ2VkIGJ5dGVzTG9hZGVkIGFuZCB0b3RhbEJ5dGVzIHRvIHVuc2lnbmVkIGxv bmcgbG9uZy4KKworICAgICAgICAqIGZpbGVhcGkvRmlsZVdyaXRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGaWxlV3JpdGVyOjpmaXJlRXZlbnQpOiBSZW1vdmVkIG5hcnJvd2luZyBjYXN0cyBp biBjYWxsIHRvCisgICAgICAgIFByb2dyZXNzRXZlbnQ6OmNyZWF0ZS4KKworICAgICAgICAqIGh0 bWwvY2FudmFzL0FycmF5QnVmZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFycmF5QnVmZmVy Ojp0cnlBbGxvY2F0ZSk6IEFkZGVkIGEgY29tbWVudCBiZWNhdXNlIHRoZSBjb2RlIGhlcmUgc2Vl bXMgd3JvbmcuCisKKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OmRpZFNlbmREYXRhKTogUmVtb3ZlZCBuYXJyb3dpbmcg Y2FzdHMgaW4gY2FsbCB0bworICAgICAgICBYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQ6OmNy ZWF0ZS4KKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpkaWRSZWNlaXZlRGF0YSk6 IFJlbW92ZWQgbmFycm93aW5nIGNhc3RzIGluIGNhbGwgdG8KKyAgICAgICAgZGlzcGF0Y2hQcm9n cmVzc0V2ZW50LgorCisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudC5o OiBGaXhlZCBmb3JtYXR0aW5nLiBDaGFuZ2VkIHR5cGVzIHRvIHVuc2lnbmVkIGxvbmcgbG9uZy4K KyAgICAgICAgTWFkZSBpc1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudCBvdmVycmlkZSBwcml2 YXRlLgorCisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudC5pZGw6IFR3 ZWFrZWQgZm9ybWF0dGluZyBhbmQgY2hhbmdlZCB0eXBlcyB0byB1bnNpZ25lZCBsb25nIGxvbmcu CisKKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6 OmRpc3BhdGNoUHJvZ3Jlc3NFdmVudCk6IENoYW5nZWQgdHlwZXMgdG8KKyAgICAgICAgdW5zaWdu ZWQgbG9uZyBsb25nLgorCisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVu dFRocm90dGxlLmg6IENoYW5nZWQgdHlwZXMgdG8gdW5zaWduZWQgbG9uZyBsb25nLgorCiAyMDEw LTExLTMwICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvZG9tL1Byb2dyZXNzRXZlbnQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1Byb2dyZXNzRXZlbnQuY3BwCShyZXZpc2lv biA3Mjk2MSkKKysrIFdlYkNvcmUvZG9tL1Byb2dyZXNzRXZlbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zNSw3ICszNSw3IEBAIFByb2dyZXNzRXZlbnQ6OlByb2dyZXNzRXZlbnQoKQogewogfQog Ci1Qcm9ncmVzc0V2ZW50OjpQcm9ncmVzc0V2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSwg Ym9vbCBsZW5ndGhDb21wdXRhYmxlLCB1bnNpZ25lZCBsb2FkZWQsIHVuc2lnbmVkIHRvdGFsKQor UHJvZ3Jlc3NFdmVudDo6UHJvZ3Jlc3NFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUsIGJv b2wgbGVuZ3RoQ29tcHV0YWJsZSwgdW5zaWduZWQgbG9uZyBsb25nIGxvYWRlZCwgdW5zaWduZWQg bG9uZyBsb25nIHRvdGFsKQogICAgIDogRXZlbnQodHlwZSwgZmFsc2UsIHRydWUpCiAgICAgLCBt X2xlbmd0aENvbXB1dGFibGUobGVuZ3RoQ29tcHV0YWJsZSkKICAgICAsIG1fbG9hZGVkKGxvYWRl ZCkKQEAgLTQzLDEyICs0Myw4IEBAIFByb2dyZXNzRXZlbnQ6OlByb2dyZXNzRXZlbnQoY29uc3Qg QXRvbWkKIHsKIH0KICAgICAKLXZvaWQgUHJvZ3Jlc3NFdmVudDo6aW5pdFByb2dyZXNzRXZlbnQo Y29uc3QgQXRvbWljU3RyaW5nJiB0eXBlQXJnLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYm9vbCBjYW5CdWJibGVBcmcsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGJvb2wgY2FuY2VsYWJsZUFyZywKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYm9vbCBsZW5ndGhDb21wdXRhYmxlQXJnLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb2FkZWRBcmcsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIHRvdGFsQXJnKQordm9pZCBQcm9ncmVz c0V2ZW50Ojppbml0UHJvZ3Jlc3NFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5cGVBcmcsIGJv b2wgY2FuQnViYmxlQXJnLCBib29sIGNhbmNlbGFibGVBcmcsCisgICAgYm9vbCBsZW5ndGhDb21w dXRhYmxlQXJnLCB1bnNpZ25lZCBsb25nIGxvbmcgbG9hZGVkQXJnLCB1bnNpZ25lZCBsb25nIGxv bmcgdG90YWxBcmcpCiB7ICAgIAogICAgIGlmIChkaXNwYXRjaGVkKCkpCiAgICAgICAgIHJldHVy bjsKSW5kZXg6IFdlYkNvcmUvZG9tL1Byb2dyZXNzRXZlbnQuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2RvbS9Qcm9ncmVzc0V2ZW50LmgJKHJldmlzaW9uIDcyOTYxKQorKysgV2ViQ29yZS9kb20v UHJvZ3Jlc3NFdmVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw0MCArMzAsMzUgQEAKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgIAotICAgIGNsYXNzIFByb2dyZXNzRXZlbnQgOiBwdWJsaWMg RXZlbnQgewotICAgIHB1YmxpYzoKLSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8UHJvZ3Jlc3NF dmVudD4gY3JlYXRlKCkKLSAgICAgICAgewotICAgICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBQcm9ncmVzc0V2ZW50KTsKLSAgICAgICAgfQotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxQ cm9ncmVzc0V2ZW50PiBjcmVhdGUoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBib29sIGxlbmd0 aENvbXB1dGFibGUsIHVuc2lnbmVkIGxvYWRlZCwgdW5zaWduZWQgdG90YWwpCi0gICAgICAgIHsK LSAgICAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUHJvZ3Jlc3NFdmVudCh0eXBlLCBsZW5n dGhDb21wdXRhYmxlLCBsb2FkZWQsIHRvdGFsKSk7Ci0gICAgICAgIH0KLQotICAgICAgICB2b2lk IGluaXRQcm9ncmVzc0V2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZUFyZywgCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBjYW5CdWJibGVBcmcsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYm9vbCBjYW5jZWxhYmxlQXJnLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGJvb2wgbGVuZ3RoQ29tcHV0YWJsZUFyZywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1bnNpZ25lZCBsb2FkZWRBcmcsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdW5zaWduZWQgdG90YWxBcmcpOwotICAgICAgICAKLSAgICAgICAgYm9vbCBsZW5n dGhDb21wdXRhYmxlKCkgY29uc3QgeyByZXR1cm4gbV9sZW5ndGhDb21wdXRhYmxlOyB9Ci0gICAg ICAgIHVuc2lnbmVkIGxvYWRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9hZGVkOyB9Ci0gICAgICAg IHVuc2lnbmVkIHRvdGFsKCkgY29uc3QgeyByZXR1cm4gbV90b3RhbDsgfQotICAgICAgICAKLSAg ICAgICAgdmlydHVhbCBib29sIGlzUHJvZ3Jlc3NFdmVudCgpIGNvbnN0IHsgcmV0dXJuIHRydWU7 IH0KLSAgICAgICAgCi0gICAgcHJvdGVjdGVkOgotICAgICAgICBQcm9ncmVzc0V2ZW50KCk7Ci0g ICAgICAgIFByb2dyZXNzRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBib29sIGxlbmd0 aENvbXB1dGFibGUsIHVuc2lnbmVkIGxvYWRlZCwgdW5zaWduZWQgdG90YWwpOwotCi0gICAgcHJp dmF0ZToKLSAgICAgICAgYm9vbCBtX2xlbmd0aENvbXB1dGFibGU7Ci0gICAgICAgIHVuc2lnbmVk IG1fbG9hZGVkOwotICAgICAgICB1bnNpZ25lZCBtX3RvdGFsOwotICAgIH07CitjbGFzcyBQcm9n cmVzc0V2ZW50IDogcHVibGljIEV2ZW50IHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgUGFzc1JlZlB0 cjxQcm9ncmVzc0V2ZW50PiBjcmVhdGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVm KG5ldyBQcm9ncmVzc0V2ZW50KTsKKyAgICB9CisgICAgc3RhdGljIFBhc3NSZWZQdHI8UHJvZ3Jl c3NFdmVudD4gY3JlYXRlKGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSwgYm9vbCBsZW5ndGhDb21w dXRhYmxlLCB1bnNpZ25lZCBsb25nIGxvbmcgbG9hZGVkLCB1bnNpZ25lZCBsb25nIGxvbmcgdG90 YWwpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFByb2dyZXNzRXZlbnQodHlw ZSwgbGVuZ3RoQ29tcHV0YWJsZSwgbG9hZGVkLCB0b3RhbCkpOworICAgIH0KKworICAgIHZvaWQg aW5pdFByb2dyZXNzRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlQXJnLCBib29sIGNhbkJ1 YmJsZUFyZywgYm9vbCBjYW5jZWxhYmxlQXJnLAorICAgICAgICBib29sIGxlbmd0aENvbXB1dGFi bGVBcmcsIHVuc2lnbmVkIGxvbmcgbG9uZyBsb2FkZWRBcmcsIHVuc2lnbmVkIGxvbmcgbG9uZyB0 b3RhbEFyZyk7CisKKyAgICBib29sIGxlbmd0aENvbXB1dGFibGUoKSBjb25zdCB7IHJldHVybiBt X2xlbmd0aENvbXB1dGFibGU7IH0KKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgbG9hZGVkKCkgY29u c3QgeyByZXR1cm4gbV9sb2FkZWQ7IH0KKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgdG90YWwoKSBj b25zdCB7IHJldHVybiBtX3RvdGFsOyB9CisKK3Byb3RlY3RlZDoKKyAgICBQcm9ncmVzc0V2ZW50 KCk7CisgICAgUHJvZ3Jlc3NFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUsIGJvb2wgbGVu Z3RoQ29tcHV0YWJsZSwgdW5zaWduZWQgbG9uZyBsb25nIGxvYWRlZCwgdW5zaWduZWQgbG9uZyBs b25nIHRvdGFsKTsKKworcHJpdmF0ZToKKyAgICB2aXJ0dWFsIGJvb2wgaXNQcm9ncmVzc0V2ZW50 KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQorICAgIAorICAgIGJvb2wgbV9sZW5ndGhDb21wdXRh YmxlOworICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBtX2xvYWRlZDsKKyAgICB1bnNpZ25lZCBsb25n IGxvbmcgbV90b3RhbDsKK307CiB9CiAKICNlbmRpZiAvLyBQcm9ncmVzc0V2ZW50X2gKLQpJbmRl eDogV2ViQ29yZS9kb20vUHJvZ3Jlc3NFdmVudC5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9k b20vUHJvZ3Jlc3NFdmVudC5pZGwJKHJldmlzaW9uIDcyOTYxKQorKysgV2ViQ29yZS9kb20vUHJv Z3Jlc3NFdmVudC5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTI2LDE1ICsyNiwxMiBAQAogbW9kdWxl IGV2ZW50cyB7CiAKICAgICBpbnRlcmZhY2UgUHJvZ3Jlc3NFdmVudCA6IEV2ZW50IHsKLSAgICAg ICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBib29sZWFuICAgICAgICAgbGVuZ3RoQ29tcHV0YWJsZTsK LSAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nICAgbG9hZGVkOwotICAg ICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgICB0b3RhbDsKLSAgICAgICAg IHZvaWQgICAgICAgICAgICAgICBpbml0UHJvZ3Jlc3NFdmVudChpbiBET01TdHJpbmcgdHlwZUFy ZywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBib29s ZWFuICAgICAgIGNhbkJ1YmJsZUFyZywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpbiBib29sZWFuICAgICAgIGNhbmNlbGFibGVBcmcsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gYm9vbGVhbiAgICAgICBsZW5n dGhDb21wdXRhYmxlQXJnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGluIHVuc2lnbmVkIGxvbmcgbG9hZGVkQXJnLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGluIHVuc2lnbmVkIGxvbmcgdG90YWxBcmcpOworICAg ICAgICByZWFkb25seSBhdHRyaWJ1dGUgYm9vbGVhbiBsZW5ndGhDb21wdXRhYmxlOworICAgICAg ICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBsb25nIGxvYWRlZDsKKyAgICAgICAg cmVhZG9ubHkgYXR0cmlidXRlIHVuc2lnbmVkIGxvbmcgbG9uZyB0b3RhbDsKKworICAgICAgICB2 b2lkIGluaXRQcm9ncmVzc0V2ZW50KGluIERPTVN0cmluZyB0eXBlQXJnLCBpbiBib29sZWFuIGNh bkJ1YmJsZUFyZywgaW4gYm9vbGVhbiBjYW5jZWxhYmxlQXJnLAorICAgICAgICAgICAgaW4gYm9v bGVhbiBsZW5ndGhDb21wdXRhYmxlQXJnLCBpbiB1bnNpZ25lZCBsb25nIGxvbmcgbG9hZGVkQXJn LCBpbiB1bnNpZ25lZCBsb25nIGxvbmcgdG90YWxBcmcpOwogICAgIH07CiAKIH0KSW5kZXg6IFdl YkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2ZpbGVh cGkvRmlsZVJlYWRlci5jcHAJKHJldmlzaW9uIDcyOTYxKQorKysgV2ViQ29yZS9maWxlYXBpL0Zp bGVSZWFkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwyMCArMzUsMTYgQEAKICNpbmNsdWRl ICJGaWxlUmVhZGVyLmgiCiAKICNpbmNsdWRlICJBcnJheUJ1ZmZlci5oIgotI2luY2x1ZGUgIkJs b2IuaCIKICNpbmNsdWRlICJDcm9zc1RocmVhZFRhc2suaCIKICNpbmNsdWRlICJGaWxlLmgiCiAj aW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlByb2dyZXNzRXZlbnQuaCIKICNpbmNsdWRl ICJTY3JpcHRFeGVjdXRpb25Db250ZXh0LmgiCiAjaW5jbHVkZSA8d3RmL0N1cnJlbnRUaW1lLmg+ Ci0jaW5jbHVkZSA8d3RmL093blB0ci5oPgotI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+Ci0j aW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNvbnN0IGRv dWJsZSBwcm9ncmVzc05vdGlmaWNhdGlvbkludGVydmFsTVMgPSA1MDsKK3N0YXRpYyBjb25zdCBk b3VibGUgcHJvZ3Jlc3NOb3RpZmljYXRpb25JbnRlcnZhbE1TID0gNTA7CiAKIEZpbGVSZWFkZXI6 OkZpbGVSZWFkZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCkKICAgICA6IEFjdGl2 ZURPTU9iamVjdChjb250ZXh0LCB0aGlzKQpAQCAtMTk1LDcgKzE5MSw3IEBAIHZvaWQgRmlsZVJl YWRlcjo6ZGlkU3RhcnRMb2FkaW5nKCkKIHZvaWQgRmlsZVJlYWRlcjo6ZGlkUmVjZWl2ZURhdGEo KQogewogICAgIC8vIEZpcmUgdGhlIHByb2dyZXNzIGV2ZW50IGF0IGxlYXN0IGV2ZXJ5IDUwbXMu Ci0gICAgZG91YmxlIG5vdyA9IFdURjo6Y3VycmVudFRpbWVNUygpOworICAgIGRvdWJsZSBub3cg PSBjdXJyZW50VGltZU1TKCk7CiAgICAgaWYgKCFtX2xhc3RQcm9ncmVzc05vdGlmaWNhdGlvblRp bWVNUykKICAgICAgICAgbV9sYXN0UHJvZ3Jlc3NOb3RpZmljYXRpb25UaW1lTVMgPSBub3c7CiAg ICAgZWxzZSBpZiAobm93IC0gbV9sYXN0UHJvZ3Jlc3NOb3RpZmljYXRpb25UaW1lTVMgPiBwcm9n cmVzc05vdGlmaWNhdGlvbkludGVydmFsTVMpIHsKQEAgLTIyNywxMCArMjIzLDcgQEAgdm9pZCBG aWxlUmVhZGVyOjpkaWRGYWlsKGludCBlcnJvckNvZGUpCiAKIHZvaWQgRmlsZVJlYWRlcjo6Zmly ZUV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSkKIHsKLSAgICAvLyBGSVhNRTogdGhlIGN1 cnJlbnQgUHJvZ3Jlc3NFdmVudCB1c2VzICJ1bnNpZ25lZCBsb25nIiBmb3IgdG90YWwgYW5kIGxv YWRlZCBhdHRyaWJ1dGVzLiBOZWVkIHRvIHRhbGsgd2l0aCB0aGUgc3BlYyB3cml0ZXIgdG8gcmVz b2x2ZSB0aGUgaXNzdWUuCi0gICAgdW5zaWduZWQgYnl0ZXNMb2FkZWQgPSBtX2xvYWRlciA/IG1f bG9hZGVyLT5ieXRlc0xvYWRlZCgpIDogMDsKLSAgICB1bnNpZ25lZCB0b3RhbEJ5dGVzID0gbV9s b2FkZXIgPyBtX2xvYWRlci0+dG90YWxCeXRlcygpIDogMDsKLSAgICBkaXNwYXRjaEV2ZW50KFBy b2dyZXNzRXZlbnQ6OmNyZWF0ZSh0eXBlLCB0cnVlLCBieXRlc0xvYWRlZCwgdG90YWxCeXRlcykp OworICAgIGRpc3BhdGNoRXZlbnQoUHJvZ3Jlc3NFdmVudDo6Y3JlYXRlKHR5cGUsIHRydWUsIG1f bG9hZGVyID8gbV9sb2FkZXItPmJ5dGVzTG9hZGVkKCkgOiAwLCBtX2xvYWRlciA/IG1fbG9hZGVy LT50b3RhbEJ5dGVzKCkgOiAwKSk7CiB9CiAKIEZpbGVSZWFkZXI6OlJlYWR5U3RhdGUgRmlsZVJl YWRlcjo6cmVhZHlTdGF0ZSgpIGNvbnN0CkluZGV4OiBXZWJDb3JlL2ZpbGVhcGkvRmlsZVJlYWRl ckxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9maWxlYXBpL0ZpbGVSZWFkZXJMb2Fk ZXIuY3BwCShyZXZpc2lvbiA3Mjk2MSkKKysrIFdlYkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyTG9h ZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAsNiArNTAsOCBAQAogI2luY2x1ZGUgPHd0Zi9W ZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKK3VzaW5nIG5h bWVzcGFjZSBzdGQ7CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogRmlsZVJlYWRlckxvYWRlcjo6 RmlsZVJlYWRlckxvYWRlcihSZWFkVHlwZSByZWFkVHlwZSwgRmlsZVJlYWRlckxvYWRlckNsaWVu dCogY2xpZW50KQpAQCAtMTI0LDE1ICsxMjYsMjUgQEAgdm9pZCBGaWxlUmVhZGVyTG9hZGVyOjpk aWRSZWNlaXZlUmVzcG9ucwogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgdW5zaWduZWQg bG9uZyBsb25nIGxlbmd0aCA9IHJlc3BvbnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgpOworCisg ICAgLy8gQ2hlY2sgdGhhdCB3ZSBjYW4gY2FzdCB0byB1bnNpZ25lZCBzaW5jZSB3ZSBoYXZlIHRv IGRvCisgICAgLy8gc28gdG8gY2FsbCBBcnJheUJ1ZmZlcidzIGNyZWF0ZSBmdW5jdGlvbi4KICAg ICAvLyBGSVhNRTogU3VwcG9ydCByZWFkaW5nIG1vcmUgdGhhbiB0aGUgY3VycmVudCBzaXplIGxp bWl0IG9mIEFycmF5QnVmZmVyLgotICAgIGlmIChzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nIGxv bmc+KHJlc3BvbnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgpKSA+ICBzdGQ6Om51bWVyaWNfbGlt aXRzPHVuc2lnbmVkPjo6bWF4KCkpIHsKKyAgICBpZiAobGVuZ3RoID4gbnVtZXJpY19saW1pdHM8 dW5zaWduZWQ+OjptYXgoKSkgewogICAgICAgICBmYWlsZWQoRmlsZUVycm9yOjpOT1RfUkVBREFC TEVfRVJSKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBtX3RvdGFsQnl0ZXMgPSBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4ocmVzcG9uc2UuZXhwZWN0ZWRDb250ZW50TGVuZ3RoKCkpOwogCiAg ICAgQVNTRVJUKCFtX3Jhd0RhdGEpOwotICAgIG1fcmF3RGF0YSA9IEFycmF5QnVmZmVyOjpjcmVh dGUoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG1fdG90YWxCeXRlcyksIDEpOworICAgIG1fcmF3RGF0 YSA9IEFycmF5QnVmZmVyOjpjcmVhdGUoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGxlbmd0aCksIDEp OworCisgICAgaWYgKCFtX3Jhd0RhdGEpIHsKKyAgICAgICAgZmFpbGVkKEZpbGVFcnJvcjo6Tk9U X1JFQURBQkxFX0VSUik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBtX3RvdGFsQnl0 ZXMgPSBsZW5ndGg7CiAKICAgICBpZiAobV9jbGllbnQpCiAgICAgICAgIG1fY2xpZW50LT5kaWRT dGFydExvYWRpbmcoKTsKQEAgLTE0MCwxNCArMTUyLDIzIEBAIHZvaWQgRmlsZVJlYWRlckxvYWRl cjo6ZGlkUmVjZWl2ZVJlc3BvbnMKIAogdm9pZCBGaWxlUmVhZGVyTG9hZGVyOjpkaWRSZWNlaXZl RGF0YShjb25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoUmVjZWl2ZWQpCiB7Ci0gICAgQVNTRVJU KGRhdGEgJiYgbGVuZ3RoUmVjZWl2ZWQgPiAwKTsKKyAgICBBU1NFUlQoZGF0YSk7CisgICAgQVNT RVJUKGxlbmd0aFJlY2VpdmVkID4gMCk7CiAKLSAgICAvLyBCYWlsIG91dCBpZiB3ZSBlbmNvdW50 ZXIgYW4gZXJyb3IuCisgICAgLy8gQmFpbCBvdXQgaWYgd2UgYWxyZWFkeSBlbmNvdW50ZXJlZCBh biBlcnJvci4KICAgICBpZiAobV9lcnJvckNvZGUpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1l bWNweShzdGF0aWNfY2FzdDxjaGFyKj4obV9yYXdEYXRhLT5kYXRhKCkpICsgc3RhdGljX2Nhc3Q8 dW5zaWduZWQ+KG1fYnl0ZXNMb2FkZWQpLCBkYXRhLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obGVu Z3RoUmVjZWl2ZWQpKTsKLSAgICBtX2J5dGVzTG9hZGVkICs9IHN0YXRpY19jYXN0PHVuc2lnbmVk PihsZW5ndGhSZWNlaXZlZCk7CisgICAgaW50IGxlbmd0aCA9IGxlbmd0aFJlY2VpdmVkOworICAg IHVuc2lnbmVkIGxvbmcgbG9uZyByZW1haW5pbmdCdWZmZXJTcGFjZSA9IG1fdG90YWxCeXRlcyAt IG1fYnl0ZXNMb2FkZWQ7CisgICAgaWYgKGxlbmd0aCA+IHN0YXRpY19jYXN0PGxvbmcgbG9uZz4o cmVtYWluaW5nQnVmZmVyU3BhY2UpKQorICAgICAgICBsZW5ndGggPSBzdGF0aWNfY2FzdDxpbnQ+ KHJlbWFpbmluZ0J1ZmZlclNwYWNlKTsKKworICAgIGlmIChsZW5ndGggPD0gMCkKKyAgICAgICAg cmV0dXJuOworCisgICAgbWVtY3B5KHN0YXRpY19jYXN0PGNoYXIqPihtX3Jhd0RhdGEtPmRhdGEo KSkgKyBtX2J5dGVzTG9hZGVkLCBkYXRhLCBsZW5ndGgpOworICAgIG1fYnl0ZXNMb2FkZWQgKz0g bGVuZ3RoOwogCiAgICAgbV9pc1Jhd0RhdGFDb252ZXJ0ZWQgPSBmYWxzZTsKIApJbmRleDogV2Vi Q29yZS9maWxlYXBpL0ZpbGVSZWFkZXJMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Zp bGVhcGkvRmlsZVJlYWRlckxvYWRlci5oCShyZXZpc2lvbiA3Mjk2MSkKKysrIFdlYkNvcmUvZmls ZWFwaS9GaWxlUmVhZGVyTG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTczLDggKzczLDggQEAg cHVibGljOgogCiAgICAgU3RyaW5nIHN0cmluZ1Jlc3VsdCgpOwogICAgIFBhc3NSZWZQdHI8QXJy YXlCdWZmZXI+IGFycmF5QnVmZmVyUmVzdWx0KCkgY29uc3Q7Ci0gICAgdW5zaWduZWQgYnl0ZXNM b2FkZWQoKSBjb25zdCB7IHJldHVybiBtX2J5dGVzTG9hZGVkOyB9Ci0gICAgdW5zaWduZWQgdG90 YWxCeXRlcygpIGNvbnN0IHsgcmV0dXJuIG1fdG90YWxCeXRlczsgfQorICAgIHVuc2lnbmVkIGxv bmcgbG9uZyBieXRlc0xvYWRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fYnl0ZXNMb2FkZWQ7IH0KKyAg ICB1bnNpZ25lZCBsb25nIGxvbmcgdG90YWxCeXRlcygpIGNvbnN0IHsgcmV0dXJuIG1fdG90YWxC eXRlczsgfQogICAgIGludCBlcnJvckNvZGUoKSBjb25zdCB7IHJldHVybiBtX2Vycm9yQ29kZTsg fQogCiAgICAgdm9pZCBzZXRFbmNvZGluZyhjb25zdCBTdHJpbmcmKTsKQEAgLTEwNyw4ICsxMDcs OCBAQCBwcml2YXRlOgogICAgIC8vIFRoZSBkZWNvZGVyIHVzZWQgdG8gZGVjb2RlIHRoZSB0ZXh0 IGRhdGEuCiAgICAgUmVmUHRyPFRleHRSZXNvdXJjZURlY29kZXI+IG1fZGVjb2RlcjsKIAotICAg IHVuc2lnbmVkIG1fYnl0ZXNMb2FkZWQ7Ci0gICAgdW5zaWduZWQgbV90b3RhbEJ5dGVzOworICAg IHVuc2lnbmVkIGxvbmcgbG9uZyBtX2J5dGVzTG9hZGVkOworICAgIHVuc2lnbmVkIGxvbmcgbG9u ZyBtX3RvdGFsQnl0ZXM7CiAgICAgaW50IG1fZXJyb3JDb2RlOwogfTsKIApJbmRleDogV2ViQ29y ZS9maWxlYXBpL0ZpbGVXcml0ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZmlsZWFwaS9G aWxlV3JpdGVyLmNwcAkocmV2aXNpb24gNzI5NjEpCisrKyBXZWJDb3JlL2ZpbGVhcGkvRmlsZVdy aXRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4Niw4ICsxODYsNyBAQCB2b2lkIEZpbGVXcml0 ZXI6OmRpZEZhaWwoRmlsZUVycm9yOjpFcnJvCiAKIHZvaWQgRmlsZVdyaXRlcjo6ZmlyZUV2ZW50 KGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSkKIHsKLSAgICAvLyBGSVhNRTogdGhlIGN1cnJlbnQg UHJvZ3Jlc3NFdmVudCB1c2VzICJ1bnNpZ25lZCBsb25nIiBmb3IgdG90YWwgYW5kIGxvYWRlZCBh dHRyaWJ1dGVzLiBOZWVkIHRvIHRhbGsgd2l0aCB0aGUgc3BlYyB3cml0ZXIgdG8gcmVzb2x2ZSB0 aGUgaXNzdWUuCi0gICAgZGlzcGF0Y2hFdmVudChQcm9ncmVzc0V2ZW50OjpjcmVhdGUodHlwZSwg dHJ1ZSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG1fYnl0ZXNXcml0dGVuKSwgc3RhdGljX2Nhc3Q8 dW5zaWduZWQ+KG1fYnl0ZXNUb1dyaXRlKSkpOworICAgIGRpc3BhdGNoRXZlbnQoUHJvZ3Jlc3NF dmVudDo6Y3JlYXRlKHR5cGUsIHRydWUsIG1fYnl0ZXNXcml0dGVuLCBtX2J5dGVzVG9Xcml0ZSkp OwogfQogCiB2b2lkIEZpbGVXcml0ZXI6OnNldEVycm9yKEZpbGVFcnJvcjo6RXJyb3JDb2RlIGVy cm9yQ29kZSwgRXhjZXB0aW9uQ29kZSYgZWMpCkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL0Fy cmF5QnVmZmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvY2FudmFzL0FycmF5QnVm ZmVyLmNwcAkocmV2aXNpb24gNzI5NjEpCisrKyBXZWJDb3JlL2h0bWwvY2FudmFzL0FycmF5QnVm ZmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODUsNyArODUsMTAgQEAgQXJyYXlCdWZmZXI6On5B cnJheUJ1ZmZlcigpCiB2b2lkKiBBcnJheUJ1ZmZlcjo6dHJ5QWxsb2NhdGUodW5zaWduZWQgbnVt RWxlbWVudHMsIHVuc2lnbmVkIGVsZW1lbnRCeXRlU2l6ZSkKIHsKICAgICB2b2lkKiByZXN1bHQ7 Ci0gICAgLy8gRG8gbm90IGFsbG93IDMyLWJpdCBvdmVyZmxvdyBvZiB0aGUgdG90YWwgc2l6ZQor ICAgIC8vIERvIG5vdCBhbGxvdyAzMi1iaXQgb3ZlcmZsb3cgb2YgdGhlIHRvdGFsIHNpemUuCisg ICAgLy8gRklYTUU6IFdoeSBub3Q/IFRoZSB0cnlGYXN0Q2FsbG9jIGZ1bmN0aW9uIGFscmVhZHkg Y2hlY2tzIGl0cyBhcmd1bWVudHMsCisgICAgLy8gYW5kIHdpbGwgZmFpbCBpZiB0aGVyZSBpcyBh bnkgb3ZlcmZsb3csIHNvIHdoeSBzaG91bGQgd2UgaW5jbHVkZSBhCisgICAgLy8gcmVkdWRhbnQg dW5uZWNlc3NhcmlseSByZXN0cmljdGl2ZSBjaGVjayBoZXJlPwogICAgIGlmIChudW1FbGVtZW50 cykgewogICAgICAgICB1bnNpZ25lZCB0b3RhbFNpemUgPSBudW1FbGVtZW50cyAqIGVsZW1lbnRC eXRlU2l6ZTsKICAgICAgICAgaWYgKHRvdGFsU2l6ZSAvIG51bUVsZW1lbnRzICE9IGVsZW1lbnRC eXRlU2l6ZSkKSW5kZXg6IFdlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAJKHJldmlzaW9uIDcyOTYxKQorKysg V2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIzLDcg KzEwMjMsNyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpkaWRTZW5kRGF0YSh1bnNpZ25lCiAgICAg ICAgIHJldHVybjsKIAogICAgIGlmIChtX3VwbG9hZEV2ZW50c0FsbG93ZWQpCi0gICAgICAgIG1f dXBsb2FkLT5kaXNwYXRjaEV2ZW50KFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudDo6Y3JlYXRl KGV2ZW50TmFtZXMoKS5wcm9ncmVzc0V2ZW50LCB0cnVlLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4o Ynl0ZXNTZW50KSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHRvdGFsQnl0ZXNUb0JlU2VudCkpKTsK KyAgICAgICAgbV91cGxvYWQtPmRpc3BhdGNoRXZlbnQoWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2 ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnByb2dyZXNzRXZlbnQsIHRydWUsIGJ5dGVzU2VudCwg dG90YWxCeXRlc1RvQmVTZW50KSk7CiAKICAgICBpZiAoYnl0ZXNTZW50ID09IHRvdGFsQnl0ZXNU b0JlU2VudCAmJiAhbV91cGxvYWRDb21wbGV0ZSkgewogICAgICAgICBtX3VwbG9hZENvbXBsZXRl ID0gdHJ1ZTsKQEAgLTEwOTIsNyArMTA5Miw3IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OmRpZFJl Y2VpdmVEYXRhKGNvbnMKIAogICAgICAgICBpZiAobV9hc3luYykgewogICAgICAgICAgICAgYm9v bCBsZW5ndGhDb21wdXRhYmxlID0gZXhwZWN0ZWRMZW5ndGggJiYgbV9yZWNlaXZlZExlbmd0aCA8 PSBleHBlY3RlZExlbmd0aDsKLSAgICAgICAgICAgIG1fcHJvZ3Jlc3NFdmVudFRocm90dGxlLmRp c3BhdGNoUHJvZ3Jlc3NFdmVudChsZW5ndGhDb21wdXRhYmxlLCBzdGF0aWNfY2FzdDx1bnNpZ25l ZD4obV9yZWNlaXZlZExlbmd0aCksIHN0YXRpY19jYXN0PHVuc2lnbmVkPihleHBlY3RlZExlbmd0 aCkpOworICAgICAgICAgICAgbV9wcm9ncmVzc0V2ZW50VGhyb3R0bGUuZGlzcGF0Y2hQcm9ncmVz c0V2ZW50KGxlbmd0aENvbXB1dGFibGUsIG1fcmVjZWl2ZWRMZW5ndGgsIGV4cGVjdGVkTGVuZ3Ro KTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChtX3N0YXRlICE9IExPQURJTkcpCkluZGV4OiBX ZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQuaAkocmV2aXNpb24gNzI5NjEp CisrKyBXZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQuaAkod29ya2luZyBj b3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDggQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA4LCAyMDEwIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCBKdWxpZW4g Q2hhZmZyYWl4IDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+LiBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dApAQCAtMzEsMzAgKzMxLDMwIEBACiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAotICAgIGNsYXNzIFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudCA6IHB1YmxpYyBQcm9n cmVzc0V2ZW50IHsKLSAgICBwdWJsaWM6Ci0gICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPFhNTEh0 dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudD4gY3JlYXRlKCkKLSAgICAgICAgewotICAgICAgICAgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQpOwotICAgICAg ICB9Ci0gICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVu dD4gY3JlYXRlKGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSwgYm9vbCBsZW5ndGhDb21wdXRhYmxl ID0gZmFsc2UsIHVuc2lnbmVkIGxvYWRlZCA9IDAsIHVuc2lnbmVkIHRvdGFsID0gMCkKLSAgICAg ICAgewotICAgICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBYTUxIdHRwUmVxdWVzdFByb2dy ZXNzRXZlbnQodHlwZSwgbGVuZ3RoQ29tcHV0YWJsZSwgbG9hZGVkLCB0b3RhbCkpOwotICAgICAg ICB9Ci0KLSAgICAgICAgdmlydHVhbCBib29sIGlzWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50 KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQotCi0gICAgICAgIC8vIFRob3NlIDIgbWV0aG9kcyBh cmUgdG8gYmUgY29tcGF0aWJsZSB3aXRoIEZpcmVmb3ggYW5kIGFyZSBvbmx5IGEgd3JhcHBlciBv biB0b3Agb2YgdGhlIHJlYWwgaW1wbGVtZW50YXRpb24uCi0gICAgICAgIHVuc2lnbmVkIHBvc2l0 aW9uKCkgY29uc3QgeyByZXR1cm4gbG9hZGVkKCk7IH0KLSAgICAgICAgdW5zaWduZWQgdG90YWxT aXplKCkgY29uc3QgeyByZXR1cm4gdG90YWwoKTsgfQotCi0gICAgcHJpdmF0ZToKLSAgICAgICAg WE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50KCkgeyB9Ci0gICAgICAgIFhNTEh0dHBSZXF1ZXN0 UHJvZ3Jlc3NFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUsIGJvb2wgbGVuZ3RoQ29tcHV0 YWJsZSwgdW5zaWduZWQgbG9hZGVkLCB1bnNpZ25lZCB0b3RhbCkKLSAgICAgICAgICAgIDogUHJv Z3Jlc3NFdmVudCh0eXBlLCBsZW5ndGhDb21wdXRhYmxlLCBsb2FkZWQsIHRvdGFsKQotICAgICAg ICB7Ci0gICAgICAgIH0KLSAgICB9OworY2xhc3MgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50 IDogcHVibGljIFByb2dyZXNzRXZlbnQgeworcHVibGljOgorICAgIHN0YXRpYyBQYXNzUmVmUHRy PFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudD4gY3JlYXRlKCkKKyAgICB7CisgICAgICAgIHJl dHVybiBhZG9wdFJlZihuZXcgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50KTsKKyAgICB9Cisg ICAgc3RhdGljIFBhc3NSZWZQdHI8WE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50PiBjcmVhdGUo Y29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBib29sIGxlbmd0aENvbXB1dGFibGUgPSBmYWxzZSwg dW5zaWduZWQgbG9uZyBsb25nIGxvYWRlZCA9IDAsIHVuc2lnbmVkIGxvbmcgbG9uZyB0b3RhbCA9 IDApCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFhNTEh0dHBSZXF1ZXN0UHJv Z3Jlc3NFdmVudCh0eXBlLCBsZW5ndGhDb21wdXRhYmxlLCBsb2FkZWQsIHRvdGFsKSk7CisgICAg fQorCisgICAgLy8gVGhvc2UgMiBzeW5vbnltcyBhcmUgaW5jbHVkZWQgZm9yIGNvbXBhdGliaWxp dHkgd2l0aCBGaXJlZm94LgorICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBwb3NpdGlvbigpIGNvbnN0 IHsgcmV0dXJuIGxvYWRlZCgpOyB9CisgICAgdW5zaWduZWQgbG9uZyBsb25nIHRvdGFsU2l6ZSgp IGNvbnN0IHsgcmV0dXJuIHRvdGFsKCk7IH0KKworcHJpdmF0ZToKKyAgICB2aXJ0dWFsIGJvb2wg aXNYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CisK KyAgICBYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQoKSB7IH0KKyAgICBYTUxIdHRwUmVxdWVz dFByb2dyZXNzRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBib29sIGxlbmd0aENvbXB1 dGFibGUsIHVuc2lnbmVkIGxvbmcgbG9uZyBsb2FkZWQsIHVuc2lnbmVkIGxvbmcgbG9uZyB0b3Rh bCkKKyAgICAgICAgOiBQcm9ncmVzc0V2ZW50KHR5cGUsIGxlbmd0aENvbXB1dGFibGUsIGxvYWRl ZCwgdG90YWwpCisgICAgeworICAgIH0KK307CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApJ bmRleDogV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50LmlkbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQuaWRsCShyZXZp c2lvbiA3Mjk2MSkKKysrIFdlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudC5p ZGwJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAy MDA4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAw OCwgMjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKQEAgLTI5LDggKzI5LDggQEAgbW9kdWxlIGV2ZW50cyB7CiAgICAgICAg IE5vU3RhdGljVGFibGVzCiAgICAgLy8gV2Ugc2hvdWxkIGFsc28gaW5oZXJpdCBmcm9tIExTUHJv Z3Jlc3NFdmVudCB3aGVuIHRoZSBpZGwgaXMgYWRkZWQuCiAgICAgXSBYTUxIdHRwUmVxdWVzdFBy b2dyZXNzRXZlbnQgOiBQcm9ncmVzc0V2ZW50IHsKLSAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0 ZSB1bnNpZ25lZCBsb25nICAgcG9zaXRpb247Ci0gICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUg dW5zaWduZWQgbG9uZyAgIHRvdGFsU2l6ZTsKKyAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1 bnNpZ25lZCBsb25nIGxvbmcgcG9zaXRpb247CisgICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUg dW5zaWduZWQgbG9uZyBsb25nIHRvdGFsU2l6ZTsKICAgICB9OwogCiB9CkluZGV4OiBXZWJDb3Jl L3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuY3BwCShy ZXZpc2lvbiA3Mjk2MSkKKysrIFdlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVu dFRocm90dGxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcsNyArNDcsNyBAQCBYTUxIdHRwUmVx dWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6flhNCiB7CiB9CiAKLXZvaWQgWE1MSHR0cFJlcXVl c3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoUHJvZ3Jlc3NFdmVudChib29sIGxlbmd0 aENvbXB1dGFibGUsIHVuc2lnbmVkIGxvYWRlZCwgdW5zaWduZWQgdG90YWwpCit2b2lkIFhNTEh0 dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlOjpkaXNwYXRjaFByb2dyZXNzRXZlbnQoYm9v bCBsZW5ndGhDb21wdXRhYmxlLCB1bnNpZ25lZCBsb25nIGxvbmcgbG9hZGVkLCB1bnNpZ25lZCBs b25nIGxvbmcgdG90YWwpCiB7CiAgICAgQVNTRVJUKCFzdXNwZW5kZWQoKSk7CiAgICAgaWYgKCFp c0FjdGl2ZSgpKSB7CkluZGV4OiBXZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZl bnRUaHJvdHRsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0UHJv Z3Jlc3NFdmVudFRocm90dGxlLmgJKHJldmlzaW9uIDcyOTYxKQorKysgV2ViQ29yZS94bWwvWE1M SHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDgs NyArNDgsNyBAQCBwdWJsaWM6CiAgICAgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0 bGUoRXZlbnRUYXJnZXQqKTsKICAgICB2aXJ0dWFsIH5YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZl bnRUaHJvdHRsZSgpOwogCi0gICAgdm9pZCBkaXNwYXRjaFByb2dyZXNzRXZlbnQoYm9vbCBsZW5n dGhDb21wdXRhYmxlLCB1bnNpZ25lZCBsb2FkZWQsIHVuc2lnbmVkIHRvdGFsKTsKKyAgICB2b2lk IGRpc3BhdGNoUHJvZ3Jlc3NFdmVudChib29sIGxlbmd0aENvbXB1dGFibGUsIHVuc2lnbmVkIGxv bmcgbG9uZyBsb2FkZWQsIHVuc2lnbmVkIGxvbmcgbG9uZyB0b3RhbCk7CiAgICAgdm9pZCBkaXNw YXRjaEV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+LCBQcm9ncmVzc0V2ZW50QWN0aW9uID0gRG9Ob3RG bHVzaFByb2dyZXNzRXZlbnQpOwogCiAgICAgdm9pZCBzdXNwZW5kKCk7CkBAIC02OSw4ICs2OSw4 IEBAIHByaXZhdGU6CiAgICAgRXZlbnRUYXJnZXQqIG1fdGFyZ2V0OwogCiAgICAgYm9vbCBtX2xl bmd0aENvbXB1dGFibGU7Ci0gICAgdW5zaWduZWQgbV9sb2FkZWQ7Ci0gICAgdW5zaWduZWQgbV90 b3RhbDsKKyAgICB1bnNpZ25lZCBsb25nIGxvbmcgbV9sb2FkZWQ7CisgICAgdW5zaWduZWQgbG9u ZyBsb25nIG1fdG90YWw7CiAKICAgICBib29sIG1fc3VzcGVuZGVkOwogICAgIFJlZlB0cjxFdmVu dD4gbV9wYXVzZWRFdmVudDsK