130822 2014-03-27 00:09:14 -0700 REGRESSION(r166296): caused some crashes and frequent assertion failures, and the fix is going to take a little while (Requested by thorton on #webkit). 2014-03-27 00:12:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 130768 1 commit-queue commit-queue simon.fraser thorton oldest_to_newest 994850 0 commit-queue 2014-03-27 00:09:14 -0700 http://trac.webkit.org/changeset/166296 broke the build: caused some crashes and frequent assertion failures, and the fix is going to take a little while (Requested by thorton on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 994852 1 227929 commit-queue 2014-03-27 00:09:40 -0700 Created attachment 227929 ROLLOUT of r166296 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 994853 2 227929 commit-queue 2014-03-27 00:12:05 -0700 Comment on attachment 227929 ROLLOUT of r166296 Clearing flags on attachment: 227929 Committed r166349: <http://trac.webkit.org/changeset/166349> 994854 3 commit-queue 2014-03-27 00:12:09 -0700 All reviewed patches have been landed. Closing bug. 227929 2014-03-27 00:09:40 -0700 2014-03-27 00:12:05 -0700 ROLLOUT of r166296 bug-130822-20140327000919.patch text/plain 10490 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk5Y2I1MDljYTAxZDdj ZDM1MTRjMjkzYmRiNWNlMjgzYTc3NDcyMC4uMjE1ZDkzNTBhODM2ZWM4ZDNjNWYyNzc5YjY1ZTVh ZTVkMjM5ZGEzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTAzLTI3ICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTY2Mjk2IGFuZCByMTY2MzMxLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwODIyCisKKyAgICAgICAgY2F1c2VkIHNvbWUg Y3Jhc2hlcyBhbmQgZnJlcXVlbnQgYXNzZXJ0aW9uIGZhaWx1cmVzLCBhbmQgdGhlCisgICAgICAg IGZpeCBpcyBnb2luZyB0byB0YWtlIGEgbGl0dGxlIHdoaWxlIChSZXF1ZXN0ZWQgYnkgdGhvcnRv biBvbgorICAgICAgICAjd2Via2l0KS4KKworICAgICAgICBSZXZlcnRlZCBjaGFuZ2VzZXRzOgor CisgICAgICAgICJbaU9TIFdlYktpdDJdIEZsdXNoIGFsbCBzdXJmYWNlcyBhZnRlciBwYWludGlu ZyBpbnRvIGFsbCBvZgorICAgICAgICB0aGVtLCBpbnN0ZWFkIG9mIGFmdGVyIHBhaW50aW5nIGlu dG8gZWFjaCBvbmUiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzA3NjgKKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTY2 Mjk2CisKKyAgICAgICAgIkFzc2VydGlvbiBmYWlsdXJlIGluIFJlbW90ZUxheWVyQmFja2luZ1N0 b3JlOjpmbHVzaCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzMDgxMAorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xNjYz MzEKKwogMjAxNC0wMy0yNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBGaXggZmFpbGluZyBzY3JvbGxpbmcgdGVzdHMgYnkgcmV2ZXJ0aW5nIHRvIHBy ZXZpb3VzIGJlaGF2aW9yIHdoZXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2VhOTMzYTBlZTczYzNlOWY0Y2Vl YmE4MjViY2ZmN2Q5Y2UzOWVjYy4uMzM2ODIzZjljMTc0ZTczYTdlMTViMWY0YjNlYzM2M2FjODNi Njk5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTAzLTI3ICBDb21taXQgUXVl dWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTY2Mjk2IGFuZCByMTY2MzMxLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwODIyCisKKyAgICAgICAgY2F1c2VkIHNvbWUgY3Jhc2hl cyBhbmQgZnJlcXVlbnQgYXNzZXJ0aW9uIGZhaWx1cmVzLCBhbmQgdGhlCisgICAgICAgIGZpeCBp cyBnb2luZyB0byB0YWtlIGEgbGl0dGxlIHdoaWxlIChSZXF1ZXN0ZWQgYnkgdGhvcnRvbiBvbgor ICAgICAgICAjd2Via2l0KS4KKworICAgICAgICBSZXZlcnRlZCBjaGFuZ2VzZXRzOgorCisgICAg ICAgICJbaU9TIFdlYktpdDJdIEZsdXNoIGFsbCBzdXJmYWNlcyBhZnRlciBwYWludGluZyBpbnRv IGFsbCBvZgorICAgICAgICB0aGVtLCBpbnN0ZWFkIG9mIGFmdGVyIHBhaW50aW5nIGludG8gZWFj aCBvbmUiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzA3NjgKKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTY2Mjk2CisK KyAgICAgICAgIkFzc2VydGlvbiBmYWlsdXJlIGluIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpm bHVzaCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz MDgxMAorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xNjYzMzEKKwog MjAxNC0wMy0yNiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBCbGluZCBzcGVjdWxhdGl2ZSBpT1MgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvSU9TdXJmYWNlLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9JT1N1cmZhY2UuaAppbmRleCAyMDFlNWU0YTdj NTIzM2VhNGZjMzAzYWQ5ZjI5NjgzMzUxZWRmNTg1Li5iYzEyZjI4ZjI5M2Y0NTA1YTg3ZTQ1ZTRi NzkyZjAzYzVkYzkwNTc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9JT1N1cmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9JT1N1cmZhY2UuaApAQCAtNTIsNyArNTIsNiBAQCBwdWJsaWM6CiAgICAgSU9T dXJmYWNlUmVmIHN1cmZhY2UoKSBjb25zdCB7IHJldHVybiBtX3N1cmZhY2UuZ2V0KCk7IH0KICAg ICBHcmFwaGljc0NvbnRleHQmIGVuc3VyZUdyYXBoaWNzQ29udGV4dCgpOwogICAgIENHQ29udGV4 dFJlZiBlbnN1cmVQbGF0Zm9ybUNvbnRleHQoKTsKLSAgICBDR0NvbnRleHRSZWYgcGxhdGZvcm1D b250ZXh0KCkgeyByZXR1cm4gbV9jZ0NvbnRleHQuZ2V0KCk7IH0KIAogICAgIGVudW0gY2xhc3Mg U3VyZmFjZVN0YXRlIHsKICAgICAgICAgVmFsaWQsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvbWFjL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLmgKaW5kZXggMmEzZDUxZGVmZDdlYWY1 ZWU0NTQxNGM5ZmI4NTkxZjc5MWY5MDEzYS4uOTNkMjYxMDcwMWYyMDdjYjAzMjc3OWMzMGM2YmIw NzY4MzZlZWE1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVM YXllckJhY2tpbmdTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3Rl TGF5ZXJCYWNraW5nU3RvcmUuaApAQCAtNzUsMTQgKzc1LDEwIEBAIHB1YmxpYzoKICNlbmRpZgog ICAgICAgICByZXR1cm4gISFtX2Zyb250QnVmZmVyOwogICAgIH0KLQotICAgIHZvaWQgZmx1c2go KTsKLQogcHJpdmF0ZToKICAgICB2b2lkIGRyYXdJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0JiwgQ0dJbWFnZVJlZiBmcm9udEltYWdlKTsKIAogICAgIFJldGFpblB0cjxDR0ltYWdl UmVmPiBjcmVhdGVJbWFnZUZvckZyb250QnVmZmVyKCkgY29uc3Q7Ci0gICAgdm9pZCBjbGVhckJh Y2tpbmdTdG9yZSgpOwogCiAgICAgUGxhdGZvcm1DQUxheWVyUmVtb3RlKiBtX2xheWVyOwogCkBA IC05MywxMCArODksOCBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OlJlZ2lvbiBtX2RpcnR5UmVn aW9uOwogCiAgICAgUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gbV9mcm9udEJ1ZmZlcjsKLSAgICBS ZXRhaW5QdHI8Q0dDb250ZXh0UmVmPiBtX2J1ZmZlckNvbnRleHRQZW5kaW5nRmx1c2g7CiAjaWYg VVNFKElPU1VSRkFDRSkKICAgICBSZWZQdHI8V2ViQ29yZTo6SU9TdXJmYWNlPiBtX2Zyb250U3Vy ZmFjZTsKLSAgICBSZWZQdHI8V2ViQ29yZTo6SU9TdXJmYWNlPiBtX2JhY2tTdXJmYWNlUGVuZGlu Z0ZsdXNoOwogI2VuZGlmCiAKICAgICBib29sIG1fYWNjZWxlcmF0ZXNEcmF3aW5nOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllckJhY2tpbmdTdG9yZS5t bSBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW0K aW5kZXggNGU5YzI0YTdlYTAxZWYzY2JiMDk1NmI3NWU2M2Q1ZWNiZGQ3YzRmNC4uNjdkYTllYjcy MDAxOTQ0NWY4ZTNiNDg4ZTQ0ZDI1ODc5MWU1NDEyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvU2hhcmVkL21hYy9SZW1vdGVMYXllckJhY2tpbmdTdG9yZS5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLm1tCkBAIC02OCwxNiArNjgs OSBAQCB2b2lkIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjplbnN1cmVCYWNraW5nU3RvcmUoUGxh dGZvcm1DQUxheWVyUmVtb3RlKiBsYXllciwgSQogICAgIG1fYWNjZWxlcmF0ZXNEcmF3aW5nID0g YWNjZWxlcmF0ZXNEcmF3aW5nOwogICAgIG1faXNPcGFxdWUgPSBpc09wYXF1ZTsKIAotICAgIGNs ZWFyQmFja2luZ1N0b3JlKCk7Ci19Ci0KLXZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmNs ZWFyQmFja2luZ1N0b3JlKCkKLXsKICNpZiBVU0UoSU9TVVJGQUNFKQogICAgIG1fZnJvbnRTdXJm YWNlID0gbnVsbHB0cjsKLSAgICBtX2JhY2tTdXJmYWNlUGVuZGluZ0ZsdXNoID0gbnVsbHB0cjsK ICNlbmRpZgotICAgIG1fYnVmZmVyQ29udGV4dFBlbmRpbmdGbHVzaCA9IG51bGxwdHI7CiAgICAg bV9mcm9udEJ1ZmZlciA9IG51bGxwdHI7CiB9CiAKQEAgLTE1OSw4ICsxNTIsNiBAQCBSZXRhaW5Q dHI8Q0dJbWFnZVJlZj4gUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmNyZWF0ZUltYWdlRm9yRnJv bnRCdWZmZXIoKSBjb25zdAogCiBib29sIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkaXNwbGF5 KCkKIHsKLSAgICBBU1NFUlQoIW1fYnVmZmVyQ29udGV4dFBlbmRpbmdGbHVzaCk7Ci0KICAgICBp ZiAoIW1fbGF5ZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMTY4LDcgKzE1OSwxMiBA QCBib29sIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpkaXNwbGF5KCkKICAgICAvLyB0byBub3Rl IHRoYXQgb3VyIGJhY2tpbmcgc3RvcmUgaGFzIGJlZW4gY2xlYXJlZC4KICAgICBpZiAoIW1fbGF5 ZXItPm93bmVyKCkgfHwgIW1fbGF5ZXItPm93bmVyKCktPnBsYXRmb3JtQ0FMYXllckRyYXdzQ29u dGVudCgpKSB7CiAgICAgICAgIGJvb2wgcHJldmlvdXNseURyZXdDb250ZW50cyA9IGhhc0Zyb250 QnVmZmVyKCk7Ci0gICAgICAgIGNsZWFyQmFja2luZ1N0b3JlKCk7CisKKyAgICAgICAgbV9mcm9u dEJ1ZmZlciA9IG51bGxwdHI7CisjaWYgVVNFKElPU1VSRkFDRSkKKyAgICAgICAgbV9mcm9udFN1 cmZhY2UgPSBudWxscHRyOworI2VuZGlmCisKICAgICAgICAgcmV0dXJuIHByZXZpb3VzbHlEcmV3 Q29udGVudHM7CiAgICAgfQogCkBAIC0xODgsNyArMTg0LDYgQEAgYm9vbCBSZW1vdGVMYXllckJh Y2tpbmdTdG9yZTo6ZGlzcGxheSgpCiAgICAgSW50U2l6ZSBleHBhbmRlZFNjYWxlZFNpemUgPSBl eHBhbmRlZEludFNpemUoc2NhbGVkU2l6ZSk7CiAKICNpZiBVU0UoSU9TVVJGQUNFKQotICAgIEFT U0VSVCghbV9iYWNrU3VyZmFjZVBlbmRpbmdGbHVzaCk7CiAgICAgaWYgKG1fYWNjZWxlcmF0ZXNE cmF3aW5nKSB7CiAgICAgICAgIFJlZlB0cjxJT1N1cmZhY2U+IGJhY2tTdXJmYWNlID0gSU9TdXJm YWNlOjpjcmVhdGUoZXhwYW5kZWRTY2FsZWRTaXplLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKICAg ICAgICAgR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0ID0gYmFja1N1cmZhY2UtPmVuc3VyZUdyYXBo aWNzQ29udGV4dCgpOwpAQCAtMjAxLDExICsxOTYsMTAgQEAgYm9vbCBSZW1vdGVMYXllckJhY2tp bmdTdG9yZTo6ZGlzcGxheSgpCiAgICAgICAgICAgICBmcm9udEltYWdlID0gbV9mcm9udFN1cmZh Y2UtPmNyZWF0ZUltYWdlKCk7CiAgICAgICAgIGRyYXdJbkNvbnRleHQoY29udGV4dCwgZnJvbnRJ bWFnZS5nZXQoKSk7CiAKLSAgICAgICAgLy8gSWYgb3VyIGZyb250SW1hZ2UgaXMgZGVyaXZlZCBm cm9tIGFuIElPU3VyZmFjZSwgd2UgbmVlZCB0byBkZXN0cm95IHRoZSBpbWFnZSBiZWZvcmUgdGhl Ci0gICAgICAgIC8vIENHQ29udGV4dCBpdCdzIGRlcml2ZWQgZnJvbSwgc28gdGhhdCB0aGUgY29u dGV4dCBkb2Vzbid0IG1ha2UgYSBDUFUgY29weSBvZiB0aGUgc3VyZmFjZSBkYXRhLgotICAgICAg ICAvLyBTaW5jZSB0aGUgZmx1c2ggd2lsbCBoYXBwZW4gbGF0ZXIsIHRoaXMgbWVhbnMgd2UgbmVl ZCB0byBob2xkIG9uIHRvIHRoZSBJT1N1cmZhY2UKLSAgICAgICAgLy8gKGFuZCB0aHVzIGl0cyBj b250ZXh0KSB1bnRpbCBhZnRlciB0aGUgZmx1c2ggY29tcGxldGVzLgotICAgICAgICBtX2JhY2tT dXJmYWNlUGVuZGluZ0ZsdXNoID0gbV9mcm9udFN1cmZhY2U7CisgICAgICAgIC8vIElmIG91ciBm cm9udEltYWdlIGlzIGRlcml2ZWQgZnJvbSBhbiBJT1N1cmZhY2UsIHdlIG5lZWQgdG8KKyAgICAg ICAgLy8gZGVzdHJveSB0aGUgaW1hZ2UgYmVmb3JlIHRoZSBDR0NvbnRleHQgaXQncyBkZXJpdmVk IGZyb20sCisgICAgICAgIC8vIHNvIHRoYXQgdGhlIGNvbnRleHQgZG9lc24ndCBtYWtlIGEgQ1BV IGNvcHkgb2YgdGhlIHN1cmZhY2UgZGF0YS4KKyAgICAgICAgZnJvbnRJbWFnZSA9IG51bGxwdHI7 CiAgICAgICAgIG1fZnJvbnRTdXJmYWNlID0gYmFja1N1cmZhY2U7CiAKICAgICAgICAgcmV0dXJu IHRydWU7CkBAIC0yMTcsNyArMjExLDYgQEAgYm9vbCBSZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6 ZGlzcGxheSgpCiAgICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IGZyb250SW1hZ2UgPSBjcmVhdGVJ bWFnZUZvckZyb250QnVmZmVyKCk7CiAgICAgbV9mcm9udEJ1ZmZlciA9IFNoYXJlYWJsZUJpdG1h cDo6Y3JlYXRlU2hhcmVhYmxlKGV4cGFuZGVkU2NhbGVkU2l6ZSwgbV9pc09wYXF1ZSA/IFNoYXJl YWJsZUJpdG1hcDo6Tm9GbGFncyA6IFNoYXJlYWJsZUJpdG1hcDo6U3VwcG9ydHNBbHBoYSk7CiAg ICAgc3RkOjp1bmlxdWVfcHRyPEdyYXBoaWNzQ29udGV4dD4gY29udGV4dCA9IG1fZnJvbnRCdWZm ZXItPmNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpOwotICAgIG1fYnVmZmVyQ29udGV4dFBlbmRpbmdG bHVzaCA9IGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOwogICAgIGRyYXdJbkNvbnRleHQoKmNv bnRleHQsIGZyb250SW1hZ2UuZ2V0KCkpOwogICAgIAogICAgIHJldHVybiB0cnVlOwpAQCAtMjk1 LDYgKzI4OCw4IEBAIHZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmRyYXdJbkNvbnRleHQo R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBDR0ltYWdlUmVmCiAKICAgICBtX2RpcnR5UmVnaW9u ID0gUmVnaW9uKCk7CiAgICAgbV9wYWludGluZ1JlY3RzLmNsZWFyKCk7CisKKyAgICBDR0NvbnRl eHRGbHVzaChjb250ZXh0LnBsYXRmb3JtQ29udGV4dCgpKTsKIH0KIAogdm9pZCBSZW1vdGVMYXll ckJhY2tpbmdTdG9yZTo6ZW51bWVyYXRlUmVjdHNCZWluZ0RyYXduKENHQ29udGV4dFJlZiBjb250 ZXh0LCB2b2lkICheYmxvY2spKENHUmVjdCkpCkBAIC0zMTQsMzcgKzMwOSwxNSBAQCB2b2lkIFJl bW90ZUxheWVyQmFja2luZ1N0b3JlOjplbnVtZXJhdGVSZWN0c0JlaW5nRHJhd24oQ0dDb250ZXh0 UmVmIGNvbnRleHQsIHZvaQogCiB2b2lkIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjphcHBseUJh Y2tpbmdTdG9yZVRvTGF5ZXIoQ0FMYXllciAqbGF5ZXIpCiB7Ci0gICAgbGF5ZXIuY29udGVudHNP cGFxdWUgPSBtX2lzT3BhcXVlOwotCiAjaWYgVVNFKElPU1VSRkFDRSkKLSAgICBpZiAoYWNjZWxl cmF0ZXNEcmF3aW5nKCkpIHsKKyAgICBpZiAoYWNjZWxlcmF0ZXNEcmF3aW5nKCkpCiAgICAgICAg IGxheWVyLmNvbnRlbnRzID0gKGlkKW1fZnJvbnRTdXJmYWNlLT5zdXJmYWNlKCk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0jZW5kaWYKLQorICAgIGVsc2UKKyAgICAgICAgbGF5ZXIuY29udGVu dHMgPSAoaWQpY3JlYXRlSW1hZ2VGb3JGcm9udEJ1ZmZlcigpLmdldCgpOworI2Vsc2UKICAgICBB U1NFUlQoIWFjY2VsZXJhdGVzRHJhd2luZygpKTsKICAgICBsYXllci5jb250ZW50cyA9IChpZClj cmVhdGVJbWFnZUZvckZyb250QnVmZmVyKCkuZ2V0KCk7Ci19Ci0KLXZvaWQgUmVtb3RlTGF5ZXJC YWNraW5nU3RvcmU6OmZsdXNoKCkKLXsKLSNpZiBVU0UoSU9TVVJGQUNFKQotICAgIGlmIChhY2Nl bGVyYXRlc0RyYXdpbmcoKSkgewotICAgICAgICBpZiAobV9mcm9udFN1cmZhY2UpIHsKLSAgICAg ICAgICAgIENHQ29udGV4dFJlZiBwbGF0Zm9ybUNvbnRleHQgPSBtX2Zyb250U3VyZmFjZS0+cGxh dGZvcm1Db250ZXh0KCk7Ci0gICAgICAgICAgICBBU1NFUlQocGxhdGZvcm1Db250ZXh0KTsKLSAg ICAgICAgICAgIENHQ29udGV4dEZsdXNoKHBsYXRmb3JtQ29udGV4dCk7Ci0gICAgICAgICAgICBt X2JhY2tTdXJmYWNlUGVuZGluZ0ZsdXNoID0gbnVsbHB0cjsKLSAgICAgICAgfQotICAgICAgICBy ZXR1cm47Ci0gICAgfQogI2VuZGlmCiAKLSAgICBBU1NFUlQoIWFjY2VsZXJhdGVzRHJhd2luZygp KTsKLQotICAgIGlmIChtX2J1ZmZlckNvbnRleHRQZW5kaW5nRmx1c2gpIHsKLSAgICAgICAgQ0dD b250ZXh0Rmx1c2gobV9idWZmZXJDb250ZXh0UGVuZGluZ0ZsdXNoLmdldCgpKTsKLSAgICAgICAg bV9idWZmZXJDb250ZXh0UGVuZGluZ0ZsdXNoID0gbnVsbHB0cjsKLSAgICB9CisgICAgbGF5ZXIu Y29udGVudHNPcGFxdWUgPSBtX2lzT3BhcXVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbSBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWEubW0KaW5kZXggODM3NWQ4MDA1Zjk5OWM3M2QwMWUxNWNmNjFjMDliM2Q3ZDEwZTVh NS4uMTE2OGFlZGM4YWIyMTAwNzc2YTlhMjQ5ZTI3YjU2Y2NkODc4ZGE2NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Jl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tCkBAIC0zMDIsMTcgKzMwMiw2IEBAIHZvaWQgUmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OmxheWVyRmx1c2hUaW1lckZpcmVkKFdlYkNvcmU6OlRp bWVyPFJlbW90ZUxheWVyCiAgICAgZmx1c2hMYXllcnMoKTsKIH0KIAotc3RhdGljIHZvaWQgZmx1 c2hCYWNraW5nU3RvcmVDaGFuZ2VzSW5UcmFuc2FjdGlvbihSZW1vdGVMYXllclRyZWVUcmFuc2Fj dGlvbiYgdHJhbnNhY3Rpb24pCi17Ci0gICAgZm9yIChhdXRvJiBsYXllclByb3BlcnRpZXMgOiB0 cmFuc2FjdGlvbi5jaGFuZ2VkTGF5ZXJzKCkudmFsdWVzKCkpIHsKLSAgICAgICAgaWYgKCFsYXll clByb3BlcnRpZXMtPmNoYW5nZWRQcm9wZXJ0aWVzICYgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rp b246OkJhY2tpbmdTdG9yZUNoYW5nZWQpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAg aWYgKFJlbW90ZUxheWVyQmFja2luZ1N0b3JlKiBiYWNraW5nU3RvcmUgPSBsYXllclByb3BlcnRp ZXMtPmJhY2tpbmdTdG9yZS5nZXQoKSkKLSAgICAgICAgICAgIGJhY2tpbmdTdG9yZS0+Zmx1c2go KTsKLSAgICB9Ci19Ci0KIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OmZsdXNoTGF5 ZXJzKCkKIHsKICAgICBpZiAoIW1fcm9vdExheWVyKQpAQCAtMzI4LDYgKzMxNyw4IEBAIHZvaWQg UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OmZsdXNoTGF5ZXJzKCkKIAogICAgIG1fcmVtb3Rl TGF5ZXJUcmVlQ29udGV4dC0+Zmx1c2hPdXRPZlRyZWVMYXllcnMoKTsKIAorICAgIEFTU0VSVCht X3Jvb3RMYXllcik7CisKICAgICAvLyBGSVhNRTogbWluaXplIHRoZXNlIHRyYW5zYWN0aW9ucyBp ZiBub3RoaW5nIGNoYW5nZWQuCiAgICAgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24gbGF5ZXJU cmFuc2FjdGlvbjsKICAgICBtX3JlbW90ZUxheWVyVHJlZUNvbnRleHQtPmJ1aWxkVHJhbnNhY3Rp b24obGF5ZXJUcmFuc2FjdGlvbiwgKm1fcm9vdExheWVyKTsKQEAgLTMzOSw5ICszMzAsNiBAQCB2 b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjpmbHVzaExheWVycygpCiAgICAgICAgIHRv UmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3IobV93ZWJQYWdlLT5zY3JvbGxpbmdDb29yZGluYXRv cigpKS0+YnVpbGRUcmFuc2FjdGlvbihzY3JvbGxpbmdUcmFuc2FjdGlvbik7CiAjZW5kaWYKIAot ICAgIC8vIEZJWE1FOiBNb3ZlIGZsdXNoaW5nIGJhY2tpbmcgc3RvcmUgYW5kIHNlbmRpbmcgQ29t bWl0TGF5ZXJUcmVlIG9udG8gYSBiYWNrZ3JvdW5kIHRocmVhZC4KLSAgICBmbHVzaEJhY2tpbmdT dG9yZUNoYW5nZXNJblRyYW5zYWN0aW9uKGxheWVyVHJhbnNhY3Rpb24pOwotCiAgICAgbV93ZWJQ YWdlLT5zZW5kKE1lc3NhZ2VzOjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpDb21t aXRMYXllclRyZWUobGF5ZXJUcmFuc2FjdGlvbiwgc2Nyb2xsaW5nVHJhbnNhY3Rpb24pKTsKIH0K IAo=