220518 2021-01-11 11:38:20 -0800 Crash in pageDidComputePageRects() 2021-01-11 15:54:34 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney ddkilzer rniwa thorton oldest_to_newest 1718754 0 katherine_cheney 2021-01-11 11:38:20 -0800 auto *printInfo = [view->_printOperation printInfo] in WKPrintingView.mm is causing a crash. 1718755 1 katherine_cheney 2021-01-11 11:38:40 -0800 rdar://problem/71065870 1718759 2 417395 katherine_cheney 2021-01-11 11:56:08 -0800 Created attachment 417395 Patch 1718856 3 ews-feeder 2021-01-11 15:54:32 -0800 Committed r271384: <https://trac.webkit.org/changeset/271384> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417395. 417395 2021-01-11 11:56:08 -0800 2021-01-11 15:54:33 -0800 Patch bug-220518-20210111115607.patch text/plain 14103 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ5OThjMDFlOGFlZGEyZTEy MTg1YjZmOGYyM2Q4Njc2YTJjZWVlOTQuLjc4ODMyYTcyN2VhMmMxODllMWM5NGFmZTY3YTk2MzVk OGViYWFiNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjEtMDEtMTEgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2ggaW4gcGFn ZURpZENvbXB1dGVQYWdlUmVjdHMoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjIwNTE4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MTA2NTg3MD4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIF9w cmludE9wZXJhdGlvbiBhIHdlYWsgcG9pbnRlciBhbmQgY2hlY2sgaXQgYmVmb3JlIHVzZS4KKyAg ICAgICAgU2luY2UgV0tQcmludGluZ1ZpZXcgaXMgcmVmIGNvdW50ZWQsIGEgcmVmZXJlbmNlIGNv dWxkIHN0aWxsIGV4aXN0CisgICAgICAgIGV2ZW4gaWYgX3ByaW50T3BlcmF0aW9uIGlzIG5pbC4g UmVtb3ZlIHRoZSBjb21tZW50IGFzIGl0IGlzIG5vdCBhCisgICAgICAgIGp1c3RpZmljYXRpb24g Zm9yIGEgcmF3IHBvaW50ZXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLUHJpbnRpbmdW aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS1ByaW50aW5nVmlldy5tbToKKyAgICAg ICAgKC1bV0tQcmludGluZ1ZpZXcgX2FkanVzdFByaW50aW5nTWFyZ2luc0ZvckhlYWRlckFuZEZv b3Rlcl0pOgorICAgICAgICAoLVtXS1ByaW50aW5nVmlldyBfZmlyc3RQcmludGVkUGFnZU51bWJl cl0pOgorICAgICAgICAoLVtXS1ByaW50aW5nVmlldyBfbGFzdFByaW50ZWRQYWdlTnVtYmVyXSk6 CisgICAgICAgICgtW1dLUHJpbnRpbmdWaWV3IF9wcmVwYXJlUERGRGF0YUZvclByaW50aW5nT25T ZWNvbmRhcnlUaHJlYWRdKToKKyAgICAgICAgKHBhZ2VEaWRDb21wdXRlUGFnZVJlY3RzKToKKyAg ICAgICAgKC1bV0tQcmludGluZ1ZpZXcgX2Fza1BhZ2VUb0NvbXB1dGVQYWdlUmVjdHNdKToKKyAg ICAgICAgKC1bV0tQcmludGluZ1ZpZXcga25vd3NQYWdlUmFuZ2U6XSk6CisgICAgICAgICgtW1dL UHJpbnRpbmdWaWV3IF9kcmF3UHJldmlldzpdKToKKyAgICAgICAgKC1bV0tQcmludGluZ1ZpZXcg ZHJhd1JlY3Q6XSk6CisgICAgICAgICgtW1dLUHJpbnRpbmdWaWV3IF9kcmF3UGFnZUJvcmRlcldp dGhTaXplT25NYWluVGhyZWFkOl0pOgorICAgICAgICAoLVtXS1ByaW50aW5nVmlldyBkcmF3UGFn ZUJvcmRlcldpdGhTaXplOl0pOgorICAgICAgICAoLVtXS1ByaW50aW5nVmlldyByZWN0Rm9yUGFn ZTpdKToKKyAgICAgICAgKC1bV0tQcmludGluZ1ZpZXcgbG9jYXRpb25PZlByaW50UmVjdDpdKToK KyAgICAgICAgKC1bV0tQcmludGluZ1ZpZXcgYmVnaW5Eb2N1bWVudF0pOgorICAgICAgICAoLVtX S1ByaW50aW5nVmlldyBlbmREb2N1bWVudF0pOgorCiAyMDIxLTAxLTA1ICBXZW5zb24gSHNpZWgg IDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZmFjdG9yIHNvbWUgbG9naWMg YXJvdW5kIHRvdWNoIGV2ZW50IGRlZmVycmluZyBnZXN0dXJlIHJlY29nbml6ZXJzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tQcmludGluZ1ZpZXcuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS1ByaW50aW5nVmlldy5oCmluZGV4IGIyNzljNDkxMGYz N2NjOTBkMWYxYjlmYzgxY2ZjNDY4NWU1YWZiZjcuLjU5YzkwZTc5MzQyZmIyOGI0MDUwNjlmMDNk OGVjM2RjMTYyYjRlZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9X S1ByaW50aW5nVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS1ByaW50 aW5nVmlldy5oCkBAIC00NCw3ICs0NCw3IEBAIGNsYXNzIFdlYkZyYW1lUHJveHk7CiAKIEBpbnRl cmZhY2UgV0tQcmludGluZ1ZpZXcgOiBOU1ZpZXcgewogQHB1YmxpYwotICAgIE5TUHJpbnRPcGVy YXRpb24gKl9wcmludE9wZXJhdGlvbjsgLy8gV0tQcmludGluZ1ZpZXcgaXMgb3duZWQgYnkgdGhl IG9wZXJhdGlvbi4KKyAgICBXZWFrT2JqQ1B0cjxOU1ByaW50T3BlcmF0aW9uPiBfcHJpbnRPcGVy YXRpb247CiAgICAgUmV0YWluUHRyPE5TVmlldz4gX3drVmlldzsKIAogICAgIFJlZlB0cjxXZWJL aXQ6OldlYkZyYW1lUHJveHk+IF93ZWJGcmFtZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL21hYy9XS1ByaW50aW5nVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L21hYy9XS1ByaW50aW5nVmlldy5tbQppbmRleCAyYjA0MjIyNGYzOWM4MTYyOGE4ZjhkZmY5NWFk ZGE4Yjk2OWExMTI1Li5kZjA5NTU3YmU0MTk4MDEyMTk3N2I2ZGIxYThhMjY4MmRiODQwZTM3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tQcmludGluZ1ZpZXcubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLUHJpbnRpbmdWaWV3Lm1tCkBAIC0x MzEsNyArMTMxLDEwIEBAIHN0YXRpYyBCT09MIGlzRm9yY2luZ1ByZXZpZXdVcGRhdGU7CiB7CiAg ICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsgLy8gVGhpcyBmdW5jdGlvbiBjYWxscyB0aGUg Y2xpZW50LCB3aGljaCBzaG91bGQgb25seSBiZSBkb25lIG9uIG1haW4gdGhyZWFkLgogCi0gICAg TlNQcmludEluZm8gKmluZm8gPSBbX3ByaW50T3BlcmF0aW9uIHByaW50SW5mb107CisgICAgaWYg KCFfcHJpbnRPcGVyYXRpb24pCisgICAgICAgIHJldHVybjsKKworICAgIE5TUHJpbnRJbmZvICpp bmZvID0gW19wcmludE9wZXJhdGlvbi5nZXQoKSBwcmludEluZm9dOwogICAgIE5TTXV0YWJsZURp Y3Rpb25hcnkgKmluZm9EaWN0aW9uYXJ5ID0gW2luZm8gZGljdGlvbmFyeV07CiAKICAgICAvLyBX ZSBuZWVkIHRvIG1vZGlmeSB0aGUgdG9wIGFuZCBib3R0b20gbWFyZ2lucyBpbiB0aGUgTlNQcmlu dEluZm8gdG8gYWNjb3VudCBmb3IgdGhlIHNwYWNlIG5lZWRlZCBieSB0aGUKQEAgLTE4MywxNyAr MTg2LDIzIEBAIHN0YXRpYyBCT09MIGlzRm9yY2luZ1ByZXZpZXdVcGRhdGU7CiAKIC0gKE5TVUlu dGVnZXIpX2ZpcnN0UHJpbnRlZFBhZ2VOdW1iZXIKIHsKKyAgICBpZiAoIV9wcmludE9wZXJhdGlv bikKKyAgICAgICAgcmV0dXJuIDA7CisKICAgICAvLyBOZWVkIHRvIGRpcmVjdGx5IGFjY2VzcyB0 aGUgZGljdGlvbmFyeSBiZWNhdXNlIC1bTlNQcmludE9wZXJhdGlvbiBwYWdlUmFuZ2VdIHZlcmlm aWVzIHBhZ2luYXRpb24sIHBvdGVudGlhbGx5IGNhdXNpbmcgcmVjdXJzaW9uLgotICAgIHJldHVy biBbW1tbX3ByaW50T3BlcmF0aW9uIHByaW50SW5mb10gZGljdGlvbmFyeV0gb2JqZWN0Rm9yS2V5 Ok5TUHJpbnRGaXJzdFBhZ2VdIHVuc2lnbmVkSW50ZWdlclZhbHVlXTsKKyAgICByZXR1cm4gW1tb W19wcmludE9wZXJhdGlvbi5nZXQoKSBwcmludEluZm9dIGRpY3Rpb25hcnldIG9iamVjdEZvcktl eTpOU1ByaW50Rmlyc3RQYWdlXSB1bnNpZ25lZEludGVnZXJWYWx1ZV07CiB9CiAKIC0gKE5TVUlu dGVnZXIpX2xhc3RQcmludGVkUGFnZU51bWJlcgogewogICAgIEFTU0VSVChbc2VsZiBfaGFzUGFn ZVJlY3RzXSk7CiAKKyAgICBpZiAoIV9wcmludE9wZXJhdGlvbikKKyAgICAgICAgcmV0dXJuIDA7 CisKICAgICAvLyBOZWVkIHRvIGRpcmVjdGx5IGFjY2VzcyB0aGUgZGljdGlvbmFyeSBiZWNhdXNl IC1bTlNQcmludE9wZXJhdGlvbiBwYWdlUmFuZ2VdIHZlcmlmaWVzIHBhZ2luYXRpb24sIHBvdGVu dGlhbGx5IGNhdXNpbmcgcmVjdXJzaW9uLgotICAgIE5TVUludGVnZXIgZmlyc3RQYWdlID0gW1tb W19wcmludE9wZXJhdGlvbiBwcmludEluZm9dIGRpY3Rpb25hcnldIG9iamVjdEZvcktleTpOU1By aW50Rmlyc3RQYWdlXSB1bnNpZ25lZEludGVnZXJWYWx1ZV07Ci0gICAgTlNVSW50ZWdlciBsYXN0 UGFnZSA9IFtbW1tfcHJpbnRPcGVyYXRpb24gcHJpbnRJbmZvXSBkaWN0aW9uYXJ5XSBvYmplY3RG b3JLZXk6TlNQcmludExhc3RQYWdlXSB1bnNpZ25lZEludGVnZXJWYWx1ZV07CisgICAgTlNVSW50 ZWdlciBmaXJzdFBhZ2UgPSBbW1tbX3ByaW50T3BlcmF0aW9uLmdldCgpIHByaW50SW5mb10gZGlj dGlvbmFyeV0gb2JqZWN0Rm9yS2V5Ok5TUHJpbnRGaXJzdFBhZ2VdIHVuc2lnbmVkSW50ZWdlclZh bHVlXTsKKyAgICBOU1VJbnRlZ2VyIGxhc3RQYWdlID0gW1tbW19wcmludE9wZXJhdGlvbi5nZXQo KSBwcmludEluZm9dIGRpY3Rpb25hcnldIG9iamVjdEZvcktleTpOU1ByaW50TGFzdFBhZ2VdIHVu c2lnbmVkSW50ZWdlclZhbHVlXTsKICAgICBpZiAobGFzdFBhZ2UgLSBmaXJzdFBhZ2UgPj0gX3By aW50aW5nUGFnZVJlY3RzLnNpemUoKSkKICAgICAgICAgcmV0dXJuIF9wcmludGluZ1BhZ2VSZWN0 cy5zaXplKCk7CiAgICAgcmV0dXJuIGxhc3RQYWdlOwpAQCAtMjQ1LDcgKzI1NCw3IEBAIHN0YXRp YyB2b2lkIHBhZ2VEaWREcmF3VG9JbWFnZShjb25zdCBXZWJLaXQ6OlNoYXJlYWJsZUJpdG1hcDo6 SGFuZGxlJiBpbWFnZUhhbmRsCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAot ICAgIGlmICghX3dlYkZyYW1lLT5wYWdlKCkpIHsKKyAgICBpZiAoIV93ZWJGcmFtZS0+cGFnZSgp IHx8ICFfcHJpbnRPcGVyYXRpb24pIHsKICAgICAgICAgX3ByaW50aW5nQ2FsbGJhY2tDb25kaXRp b24ubm90aWZ5T25lKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yNjQsNyArMjczLDcg QEAgc3RhdGljIHZvaWQgcGFnZURpZERyYXdUb0ltYWdlKGNvbnN0IFdlYktpdDo6U2hhcmVhYmxl Qml0bWFwOjpIYW5kbGUmIGltYWdlSGFuZGwKICAgICBBU1NFUlQoZmlyc3RQYWdlIDw9IGxhc3RQ YWdlKTsKICAgICBMT0coUHJpbnRpbmcsICJXS1ByaW50aW5nVmlldyByZXF1ZXN0aW5nIFBERiBk YXRhIGZvciBwYWdlcyAldS4uLiV1IiwgZmlyc3RQYWdlLCBsYXN0UGFnZSk7CiAKLSAgICBXZWJL aXQ6OlByaW50SW5mbyBwcmludEluZm8oW19wcmludE9wZXJhdGlvbiBwcmludEluZm9dKTsKKyAg ICBXZWJLaXQ6OlByaW50SW5mbyBwcmludEluZm8oW19wcmludE9wZXJhdGlvbi5nZXQoKSBwcmlu dEluZm9dKTsKICAgICAvLyBSZXR1cm4gdG8gcHJpbnRpbmcgbW9kZSBpZiB3ZSdyZSBhbHJlYWR5 IGJhY2sgdG8gc2NyZWVuIChlLmcuIGR1ZSB0byB3aW5kb3cgcmVzaXppbmcpLgogICAgIF93ZWJG cmFtZS0+cGFnZSgpLT5iZWdpblByaW50aW5nKF93ZWJGcmFtZS5nZXQoKSwgcHJpbnRJbmZvKTsK IApAQCAtMjk4LDYgKzMwNyw4IEBAIHN0YXRpYyB2b2lkIHBhZ2VEaWRDb21wdXRlUGFnZVJlY3Rz KGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpJbnRSZWN0PiYgcGFnZVJlY3RzLCBkCiAgICAgQVNTRVJU KFJ1bkxvb3A6OmlzTWFpbigpKTsKIAogICAgIFdLUHJpbnRpbmdWaWV3ICp2aWV3ID0gY29udGV4 dC0+dmlldy5nZXQoKTsKKyAgICBpZiAoIXZpZXctPl9wcmludE9wZXJhdGlvbikKKyAgICAgICAg cmV0dXJuOwogCiAgICAgLy8gSWYgdGhlIHVzZXIgaGFzIGFscmVhZHkgY2hhbmdlZCBwcmludCBz ZXR1cCwgdGhlbiB0aGlzIHJlc3BvbnNlIGlzIG9ic29sZXRlLgogICAgIGlmIChjb250ZXh0LT5j YWxsYmFja0lEID09IHZpZXctPl9leHBlY3RlZENvbXB1dGVkUGFnZXNDYWxsYmFjaykgewpAQCAt MzI0LDcgKzMzNSw3IEBAIHN0YXRpYyB2b2lkIHBhZ2VEaWRDb21wdXRlUGFnZVJlY3RzKGNvbnN0 IFZlY3RvcjxXZWJDb3JlOjpJbnRSZWN0PiYgcGFnZVJlY3RzLCBkCiAgICAgICAgIExPRyhQcmlu dGluZywgIldLUHJpbnRpbmdWaWV3IHNldHRpbmcgZnJhbWUgc2l6ZSB0byB4OiVnIHk6JWcgd2lk dGg6JWcgaGVpZ2h0OiVnIiwgbmV3RnJhbWVTaXplLm9yaWdpbi54LCBuZXdGcmFtZVNpemUub3Jp Z2luLnksIG5ld0ZyYW1lU2l6ZS5zaXplLndpZHRoLCBuZXdGcmFtZVNpemUuc2l6ZS5oZWlnaHQp OwogICAgICAgICBbdmlldyBzZXRGcmFtZTpuZXdGcmFtZVNpemVdOwogICAgICAgICAvLyBTZXQg QHBhZ2UgbWFyZ2luLgotICAgICAgICBhdXRvICpwcmludEluZm8gPSBbdmlldy0+X3ByaW50T3Bl cmF0aW9uIHByaW50SW5mb107CisgICAgICAgIGF1dG8gKnByaW50SW5mbyA9IFt2aWV3LT5fcHJp bnRPcGVyYXRpb24uZ2V0KCkgcHJpbnRJbmZvXTsKICAgICAgICAgW3ByaW50SW5mbyBzZXRUb3BN YXJnaW46Y29tcHV0ZWRQYWdlTWFyZ2luLnRvcCgpXTsKICAgICAgICAgW3ByaW50SW5mbyBzZXRC b3R0b21NYXJnaW46Y29tcHV0ZWRQYWdlTWFyZ2luLmJvdHRvbSgpXTsKICAgICAgICAgW3ByaW50 SW5mbyBzZXRMZWZ0TWFyZ2luOmNvbXB1dGVkUGFnZU1hcmdpbi5sZWZ0KCldOwpAQCAtMzQ0LDcg KzM1NSw3IEBAIHN0YXRpYyB2b2lkIHBhZ2VEaWRDb21wdXRlUGFnZVJlY3RzKGNvbnN0IFZlY3Rv cjxXZWJDb3JlOjpJbnRSZWN0PiYgcGFnZVJlY3RzLCBkCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6 OmlzTWFpbigpKTsKIAotICAgIGlmICghX3dlYkZyYW1lLT5wYWdlKCkpCisgICAgaWYgKCFfd2Vi RnJhbWUtPnBhZ2UoKSB8fCAhX3ByaW50T3BlcmF0aW9uKQogICAgICAgICByZXR1cm4gTk87CiAK ICAgICBBU1NFUlQoIV9leHBlY3RlZENvbXB1dGVkUGFnZXNDYWxsYmFjayk7CkBAIC0zNTgsNyAr MzY5LDcgQEAgc3RhdGljIHZvaWQgcGFnZURpZENvbXB1dGVQYWdlUmVjdHMoY29uc3QgVmVjdG9y PFdlYkNvcmU6OkludFJlY3Q+JiBwYWdlUmVjdHMsIGQKICAgICBjb250ZXh0LT52aWV3ID0gc2Vs ZjsKICAgICBjb250ZXh0LT5jYWxsYmFja0lEID0gX2V4cGVjdGVkQ29tcHV0ZWRQYWdlc0NhbGxi YWNrOwogCi0gICAgX3dlYkZyYW1lLT5wYWdlKCktPmNvbXB1dGVQYWdlc0ZvclByaW50aW5nKF93 ZWJGcmFtZS5nZXQoKSwgV2ViS2l0OjpQcmludEluZm8oW19wcmludE9wZXJhdGlvbiBwcmludElu Zm9dKSwgV1RGTW92ZShjYWxsYmFjaykpOworICAgIF93ZWJGcmFtZS0+cGFnZSgpLT5jb21wdXRl UGFnZXNGb3JQcmludGluZyhfd2ViRnJhbWUuZ2V0KCksIFdlYktpdDo6UHJpbnRJbmZvKFtfcHJp bnRPcGVyYXRpb24uZ2V0KCkgcHJpbnRJbmZvXSksIFdURk1vdmUoY2FsbGJhY2spKTsKICAgICBy ZXR1cm4gWUVTOwogfQogCkBAIC0zODQsNyArMzk1LDExIEBAIHN0YXRpYyB2b2lkIHByZXBhcmVE YXRhRm9yUHJpbnRpbmdPblNlY29uZGFyeVRocmVhZChXS1ByaW50aW5nVmlldyAqdmlldykKIC0g KEJPT0wpa25vd3NQYWdlUmFuZ2U6KE5TUmFuZ2VQb2ludGVyKXJhbmdlCiB7CiAgICAgTE9HKFBy aW50aW5nLCAiLVtXS1ByaW50aW5nVmlldyAlcCBrbm93c1BhZ2VSYW5nZTpdLCAlcywgJXMiLCBz ZWxmLCBbc2VsZiBfaGFzUGFnZVJlY3RzXSA/ICJwcmludCBkYXRhIGlzIGF2YWlsYWJsZSIgOiAi cHJpbnQgZGF0YSBpcyBub3QgYXZhaWxhYmxlIHlldCIsIFJ1bkxvb3A6OmlzTWFpbigpID8gIm9u IG1haW4gdGhyZWFkIiA6ICJvbiBzZWNvbmRhcnkgdGhyZWFkIik7Ci0gICAgQVNTRVJUKF9wcmlu dE9wZXJhdGlvbiA9PSBbTlNQcmludE9wZXJhdGlvbiBjdXJyZW50T3BlcmF0aW9uXSk7CisgICAg CisgICAgaWYgKCFfcHJpbnRPcGVyYXRpb24pCisgICAgICAgIHJldHVybiBOTzsKKworICAgIEFT U0VSVChfcHJpbnRPcGVyYXRpb24uZ2V0KCkgPT0gW05TUHJpbnRPcGVyYXRpb24gY3VycmVudE9w ZXJhdGlvbl0pOwogCiAgICAgLy8gQXNzdW1pbmcgdGhhdCBvbmNlIHdlIHN3aXRjaCB0byBwcmlu dGluZyBmcm9tIGEgc2Vjb25kYXJ5IHRocmVhZCwgd2UgZG9uJ3QgZ28gYmFjay4KICAgICBBU1NF UlQoIV9pc1ByaW50aW5nRnJvbVNlY29uZGFyeVRocmVhZCB8fCAhUnVuTG9vcDo6aXNNYWluKCkp OwpAQCAtNTE4LDkgKzUzMywxMiBAQCBzdGF0aWMgTlNTdHJpbmcgKmxpbmtEZXN0aW5hdGlvbk5h bWUoUERGRG9jdW1lbnQgKmRvY3VtZW50LCBQREZEZXN0aW5hdGlvbiAqZGVzdAogICAgICAgICAg ICAgICAgIC8vIFRoZXJlIGlzIG5vIG5lZWQgdG8gYXNrIGFnYWluLgogICAgICAgICAgICAgICAg IF9sYXRlc3RFeHBlY3RlZFByZXZpZXdDYWxsYmFjayA9IGV4aXN0aW5nQ2FsbGJhY2s7CiAgICAg ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIGlmICghX3ByaW50T3BlcmF0aW9uKQor ICAgICAgICAgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgICAgICAgICAvLyBQcmV2aWV3 IGlzbid0IGF2YWlsYWJsZSB5ZXQsIHJlcXVlc3QgaXQgYXN5bmNocm9ub3VzbHkuCiAgICAgICAg ICAgICAgICAgLy8gUmV0dXJuIHRvIHByaW50aW5nIG1vZGUgaWYgd2UncmUgYWxyZWFkeSBiYWNr IHRvIHNjcmVlbiAoZS5nLiBkdWUgdG8gd2luZG93IHJlc2l6aW5nKS4KLSAgICAgICAgICAgICAg ICBfd2ViRnJhbWUtPnBhZ2UoKS0+YmVnaW5QcmludGluZyhfd2ViRnJhbWUuZ2V0KCksIFdlYktp dDo6UHJpbnRJbmZvKFtfcHJpbnRPcGVyYXRpb24gcHJpbnRJbmZvXSkpOworICAgICAgICAgICAg ICAgIF93ZWJGcmFtZS0+cGFnZSgpLT5iZWdpblByaW50aW5nKF93ZWJGcmFtZS5nZXQoKSwgV2Vi S2l0OjpQcmludEluZm8oW19wcmludE9wZXJhdGlvbi5nZXQoKSBwcmludEluZm9dKSk7CiAKICAg ICAgICAgICAgICAgICBJUENDYWxsYmFja0NvbnRleHQqIGNvbnRleHQgPSBuZXcgSVBDQ2FsbGJh Y2tDb250ZXh0OwogICAgICAgICAgICAgICAgIGF1dG8gY2FsbGJhY2sgPSBXZWJLaXQ6OkltYWdl Q2FsbGJhY2s6OmNyZWF0ZShbY29udGV4dF0oY29uc3QgV2ViS2l0OjpTaGFyZWFibGVCaXRtYXA6 OkhhbmRsZSYgaW1hZ2VIYW5kbGUsIFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcikgewpAQCAt NTMzLDcgKzU1MSw3IEBAIHN0YXRpYyBOU1N0cmluZyAqbGlua0Rlc3RpbmF0aW9uTmFtZShQREZE b2N1bWVudCAqZG9jdW1lbnQsIFBERkRlc3RpbmF0aW9uICpkZXN0CiAgICAgICAgICAgICAgICAg Y29udGV4dC0+dmlldyA9IHNlbGY7CiAgICAgICAgICAgICAgICAgY29udGV4dC0+Y2FsbGJhY2tJ RCA9IGNhbGxiYWNrLT5jYWxsYmFja0lEKCkudG9JbnRlZ2VyKCk7CiAKLSAgICAgICAgICAgICAg ICBfd2ViRnJhbWUtPnBhZ2UoKS0+ZHJhd1JlY3RUb0ltYWdlKF93ZWJGcmFtZS5nZXQoKSwgV2Vi S2l0OjpQcmludEluZm8oW19wcmludE9wZXJhdGlvbiBwcmludEluZm9dKSwgc2NhbGVkUHJpbnRp bmdSZWN0LCBpbWFnZVNpemUsIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICAgICAgICAgICAgICBf d2ViRnJhbWUtPnBhZ2UoKS0+ZHJhd1JlY3RUb0ltYWdlKF93ZWJGcmFtZS5nZXQoKSwgV2ViS2l0 OjpQcmludEluZm8oW19wcmludE9wZXJhdGlvbi5nZXQoKSBwcmludEluZm9dKSwgc2NhbGVkUHJp bnRpbmdSZWN0LCBpbWFnZVNpemUsIFdURk1vdmUoY2FsbGJhY2spKTsKICAgICAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTU1NCw3ICs1NzIsMTAgQEAg c3RhdGljIE5TU3RyaW5nICpsaW5rRGVzdGluYXRpb25OYW1lKFBERkRvY3VtZW50ICpkb2N1bWVu dCwgUERGRGVzdGluYXRpb24gKmRlc3QKIHsKICAgICBMT0coUHJpbnRpbmcsICJXS1ByaW50aW5n VmlldyAlcCBwcmludGluZyByZWN0IHg6JWcsIHk6JWcsIHdpZHRoOiVnLCBoZWlnaHQ6JWclcyIs IHNlbGYsIG5zUmVjdC5vcmlnaW4ueCwgbnNSZWN0Lm9yaWdpbi55LCBuc1JlY3Quc2l6ZS53aWR0 aCwgbnNSZWN0LnNpemUuaGVpZ2h0LCBbc2VsZiBfaXNQcmludGluZ1ByZXZpZXddID8gIiBmb3Ig cHJldmlldyIgOiAiIik7CiAKLSAgICBBU1NFUlQoX3ByaW50T3BlcmF0aW9uID09IFtOU1ByaW50 T3BlcmF0aW9uIGN1cnJlbnRPcGVyYXRpb25dKTsKKyAgICBpZiAoIV9wcmludE9wZXJhdGlvbikK KyAgICAgICAgcmV0dXJuOworCisgICAgQVNTRVJUKF9wcmludE9wZXJhdGlvbi5nZXQoKSA9PSBb TlNQcmludE9wZXJhdGlvbiBjdXJyZW50T3BlcmF0aW9uXSk7CiAKICAgICAvLyBBbHdheXMgdXNl IHRoZSBsaWdodCBhcHBlYXJhbmNlIHdoZW4gcHJpbnRpbmcuCiAgICAgV2ViQ29yZTo6TG9jYWxE ZWZhdWx0U3lzdGVtQXBwZWFyYW5jZSBsb2NhbEFwcGVhcmFuY2UoZmFsc2UpOwpAQCAtNjA0LDEy ICs2MjUsMTUgQEAgc3RhdGljIE5TU3RyaW5nICpsaW5rRGVzdGluYXRpb25OYW1lKFBERkRvY3Vt ZW50ICpkb2N1bWVudCwgUERGRGVzdGluYXRpb24gKmRlc3QKIHsKICAgICBBU1NFUlQoUnVuTG9v cDo6aXNNYWluKCkpOwogCisgICAgaWYgKCFfcHJpbnRPcGVyYXRpb24pCisgICAgICAgIHJldHVy bjsKKwogICAgIC8vIFdoZW4gcHJpbnRpbmcgZnJvbSBhIHNlY29uZGFyeSB0aHJlYWQsIHRoZSBt YWluIHRocmVhZCBkb2Vzbid0IGhhdmUgZ3JhcGhpY3MgY29udGV4dCBhbmQgcHJpbnRpbmcgb3Bl cmF0aW9uIHNldCB1cC4KICAgICBOU0dyYXBoaWNzQ29udGV4dCAqY3VycmVudENvbnRleHQgPSBb TlNHcmFwaGljc0NvbnRleHQgY3VycmVudENvbnRleHRdOwotICAgIFtOU0dyYXBoaWNzQ29udGV4 dCBzZXRDdXJyZW50Q29udGV4dDpbX3ByaW50T3BlcmF0aW9uIGNvbnRleHRdXTsKKyAgICBbTlNH cmFwaGljc0NvbnRleHQgc2V0Q3VycmVudENvbnRleHQ6W19wcmludE9wZXJhdGlvbi5nZXQoKSBj b250ZXh0XV07CiAKICAgICBBU1NFUlQoIVtOU1ByaW50T3BlcmF0aW9uIGN1cnJlbnRPcGVyYXRp b25dKTsKLSAgICBbTlNQcmludE9wZXJhdGlvbiBzZXRDdXJyZW50T3BlcmF0aW9uOl9wcmludE9w ZXJhdGlvbl07CisgICAgW05TUHJpbnRPcGVyYXRpb24gc2V0Q3VycmVudE9wZXJhdGlvbjpfcHJp bnRPcGVyYXRpb24uZ2V0KCkuZ2V0KCldOwogCiAgICAgW3NlbGYgZHJhd1BhZ2VCb3JkZXJXaXRo U2l6ZTpib3JkZXJTaXplXTsKIApAQCAtNjE5LDggKzY0MywxMSBAQCBzdGF0aWMgTlNTdHJpbmcg KmxpbmtEZXN0aW5hdGlvbk5hbWUoUERGRG9jdW1lbnQgKmRvY3VtZW50LCBQREZEZXN0aW5hdGlv biAqZGVzdAogCiAtICh2b2lkKWRyYXdQYWdlQm9yZGVyV2l0aFNpemU6KE5TU2l6ZSlib3JkZXJT aXplCiB7Ci0gICAgQVNTRVJUKE5TRXF1YWxTaXplcyhib3JkZXJTaXplLCBbW19wcmludE9wZXJh dGlvbiBwcmludEluZm9dIHBhcGVyU2l6ZV0pKTsgICAgCi0gICAgQVNTRVJUKF9wcmludE9wZXJh dGlvbiA9PSBbTlNQcmludE9wZXJhdGlvbiBjdXJyZW50T3BlcmF0aW9uXSk7CisgICAgaWYgKCFf cHJpbnRPcGVyYXRpb24pCisgICAgICAgIHJldHVybjsKKworICAgIEFTU0VSVChOU0VxdWFsU2l6 ZXMoYm9yZGVyU2l6ZSwgW1tfcHJpbnRPcGVyYXRpb24uZ2V0KCkgcHJpbnRJbmZvXSBwYXBlclNp emVdKSk7CisgICAgQVNTRVJUKF9wcmludE9wZXJhdGlvbi5nZXQoKSA9PSBbTlNQcmludE9wZXJh dGlvbiBjdXJyZW50T3BlcmF0aW9uXSk7CiAKICAgICBpZiAoIVJ1bkxvb3A6OmlzTWFpbigpKSB7 CiAgICAgICAgIC8vIERvbid0IGNhbGwgdGhlIGNsaWVudCBmcm9tIGEgc2Vjb25kYXJ5IHRocmVh ZC4KQEAgLTYzNiw3ICs2NjMsNyBAQCBzdGF0aWMgTlNTdHJpbmcgKmxpbmtEZXN0aW5hdGlvbk5h bWUoUERGRG9jdW1lbnQgKmRvY3VtZW50LCBQREZEZXN0aW5hdGlvbiAqZGVzdAogCiAgICAgLy8g VGhlIGhlYWRlciBhbmQgZm9vdGVyIHJlY3QgaGVpZ2h0IHNjYWxlcyB3aXRoIHRoZSBwYWdlLCBi dXQgdGhlIHdpZHRoIGlzIGFsd2F5cwogICAgIC8vIGFsbCB0aGUgd2F5IGFjcm9zcyB0aGUgcHJp bnRlZCBwYWdlIChpbnNldCBieSBwcmludGluZyBtYXJnaW5zKS4KLSAgICBOU1ByaW50SW5mbyAq cHJpbnRJbmZvID0gW19wcmludE9wZXJhdGlvbiBwcmludEluZm9dOworICAgIE5TUHJpbnRJbmZv ICpwcmludEluZm8gPSBbX3ByaW50T3BlcmF0aW9uLmdldCgpIHByaW50SW5mb107CiAgICAgQ0dG bG9hdCBzY2FsZSA9IFtwcmludEluZm8gc2NhbGluZ0ZhY3Rvcl07CiAgICAgTlNTaXplIHBhcGVy U2l6ZSA9IFtwcmludEluZm8gcGFwZXJTaXplXTsKICAgICBDR0Zsb2F0IGhlYWRlckZvb3Rlckxl ZnQgPSBbcHJpbnRJbmZvIGxlZnRNYXJnaW5dIC8gc2NhbGU7CkBAIC02NTgsNyArNjg1LDEwIEBA IHN0YXRpYyBOU1N0cmluZyAqbGlua0Rlc3RpbmF0aW9uTmFtZShQREZEb2N1bWVudCAqZG9jdW1l bnQsIFBERkRlc3RpbmF0aW9uICpkZXN0CiAKIC0gKE5TUmVjdClyZWN0Rm9yUGFnZTooTlNJbnRl Z2VyKXBhZ2UKIHsKLSAgICBBU1NFUlQoX3ByaW50T3BlcmF0aW9uID09IFtOU1ByaW50T3BlcmF0 aW9uIGN1cnJlbnRPcGVyYXRpb25dKTsKKyAgICBpZiAoIV9wcmludE9wZXJhdGlvbikKKyAgICAg ICAgcmV0dXJuIE5TWmVyb1JlY3Q7CisKKyAgICBBU1NFUlQoX3ByaW50T3BlcmF0aW9uLmdldCgp ID09IFtOU1ByaW50T3BlcmF0aW9uIGN1cnJlbnRPcGVyYXRpb25dKTsKICAgICBpZiAoIVtzZWxm IF9oYXNQYWdlUmVjdHNdKSB7CiAgICAgICAgIExPRyhQcmludGluZywgIi1bV0tQcmludGluZ1Zp ZXcgJXAgcmVjdEZvclBhZ2U6JWRdIC0gZGF0YSBpcyBub3QgeWV0IGF2YWlsYWJsZSIsIHNlbGYs IChpbnQpcGFnZSk7CiAgICAgICAgIGlmICghX3dlYkZyYW1lLT5wYWdlKCkpIHsKQEAgLTY4Niwx MyArNzE2LDE5IEBAIHN0YXRpYyBOU1N0cmluZyAqbGlua0Rlc3RpbmF0aW9uTmFtZShQREZEb2N1 bWVudCAqZG9jdW1lbnQsIFBERkRlc3RpbmF0aW9uICpkZXN0CiAvLyBUZW1wb3Jhcnkgd29ya2Fy b3VuZCBmb3IgPHJkYXI6Ly9wcm9ibGVtLzg5NDQ1MzU+LiBGb3JjZSBjb3JyZWN0IHByaW50b3V0 IHBvc2l0aW9uaW5nLgogLSAoTlNQb2ludClsb2NhdGlvbk9mUHJpbnRSZWN0OihOU1JlY3QpYVJl Y3QKIHsKLSAgICBBU1NFUlQoX3ByaW50T3BlcmF0aW9uID09IFtOU1ByaW50T3BlcmF0aW9uIGN1 cnJlbnRPcGVyYXRpb25dKTsKLSAgICByZXR1cm4gTlNNYWtlUG9pbnQoW1tfcHJpbnRPcGVyYXRp b24gcHJpbnRJbmZvXSBsZWZ0TWFyZ2luXSwgW1tfcHJpbnRPcGVyYXRpb24gcHJpbnRJbmZvXSBi b3R0b21NYXJnaW5dKTsKKyAgICBpZiAoIV9wcmludE9wZXJhdGlvbikKKyAgICAgICAgcmV0dXJu IE5TWmVyb1BvaW50OworCisgICAgQVNTRVJUKF9wcmludE9wZXJhdGlvbi5nZXQoKSA9PSBbTlNQ cmludE9wZXJhdGlvbiBjdXJyZW50T3BlcmF0aW9uXSk7CisgICAgcmV0dXJuIE5TTWFrZVBvaW50 KFtbX3ByaW50T3BlcmF0aW9uLmdldCgpIHByaW50SW5mb10gbGVmdE1hcmdpbl0sIFtbX3ByaW50 T3BlcmF0aW9uLmdldCgpIHByaW50SW5mb10gYm90dG9tTWFyZ2luXSk7CiB9CiAKIC0gKHZvaWQp YmVnaW5Eb2N1bWVudAogewotICAgIEFTU0VSVChfcHJpbnRPcGVyYXRpb24gPT0gW05TUHJpbnRP cGVyYXRpb24gY3VycmVudE9wZXJhdGlvbl0pOworICAgIGlmICghX3ByaW50T3BlcmF0aW9uKQor ICAgICAgICByZXR1cm47CisKKyAgICBBU1NFUlQoX3ByaW50T3BlcmF0aW9uLmdldCgpID09IFtO U1ByaW50T3BlcmF0aW9uIGN1cnJlbnRPcGVyYXRpb25dKTsKIAogICAgIC8vIEZvcmNpbmcgcHJl dmlldyB1cGRhdGUgZ2V0cyB1cyBoZXJlLCBidXQgcGFnZSBzZXR1cCBoYXNuJ3QgYWN0dWFsbHkg Y2hhbmdlZC4KICAgICBpZiAoaXNGb3JjaW5nUHJldmlld1VwZGF0ZSkKQEAgLTcwNyw3ICs3NDMs MTAgQEAgc3RhdGljIE5TU3RyaW5nICpsaW5rRGVzdGluYXRpb25OYW1lKFBERkRvY3VtZW50ICpk b2N1bWVudCwgUERGRGVzdGluYXRpb24gKmRlc3QKIAogLSAodm9pZCllbmREb2N1bWVudAogewot ICAgIEFTU0VSVChfcHJpbnRPcGVyYXRpb24gPT0gW05TUHJpbnRPcGVyYXRpb24gY3VycmVudE9w ZXJhdGlvbl0pOworICAgIGlmICghX3ByaW50T3BlcmF0aW9uKQorICAgICAgICByZXR1cm47CisK KyAgICBBU1NFUlQoX3ByaW50T3BlcmF0aW9uLmdldCgpID09IFtOU1ByaW50T3BlcmF0aW9uIGN1 cnJlbnRPcGVyYXRpb25dKTsKIAogICAgIC8vIEZvcmNpbmcgcHJldmlldyB1cGRhdGUgZ2V0cyB1 cyBoZXJlLCBidXQgcGFnZSBzZXR1cCBoYXNuJ3QgYWN0dWFsbHkgY2hhbmdlZC4KICAgICBpZiAo aXNGb3JjaW5nUHJldmlld1VwZGF0ZSkK