198252 2019-05-25 20:04:56 -0700 [LFC][Verification] Add additional inline and block checks 2019-05-28 10:29:45 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1539236 0 zalan 2019-05-25 20:04:56 -0700 ssia 1539237 1 webkit-bug-importer 2019-05-25 20:05:21 -0700 <rdar://problem/51140687> 1539243 2 370642 zalan 2019-05-25 20:41:18 -0700 Created attachment 370642 Patch 1539266 3 370642 commit-queue 2019-05-26 07:04:34 -0700 Comment on attachment 370642 Patch Rejecting attachment 370642 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 370642, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=370642&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=198252&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 370642 from bug 198252. Fetching: https://bugs.webkit.org/attachment.cgi?id=370642 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/WebCore/ChangeLog' is out of date W: 791a63239ae5375218b50ad88bb0d5b9c645e1d4 and refs/remotes/origin/master differ, using rebase: :040000 040000 02b59f71d47c6d744ff6dc020f8d9e60ea29e66f 91aaf3fab5e260357774f424717409022f9bd7c0 M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/WebCore/ChangeLog' is out of date W: 791a63239ae5375218b50ad88bb0d5b9c645e1d4 and refs/remotes/origin/master differ, using rebase: :040000 040000 02b59f71d47c6d744ff6dc020f8d9e60ea29e66f 91aaf3fab5e260357774f424717409022f9bd7c0 M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource Current branch master is up to date. Full output: https://webkit-queues.webkit.org/results/12293885 1539633 4 370760 zalan 2019-05-28 10:27:35 -0700 Created attachment 370760 Patch 1539634 5 zalan 2019-05-28 10:29:45 -0700 Committed r245816: <https://trac.webkit.org/changeset/245816> 370642 2019-05-25 20:41:18 -0700 2019-05-28 10:27:33 -0700 Patch bug-198252-20190525204113.patch text/plain 4773 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1Nzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNmZjFkZGJlMmZiODM2 MWUwYTY3MmY4NTk2NGQ3NzFjOTFiMDFiZC4uMjI2N2Q2NzQ1MWU3MTcyYTNmZTk2ODUzNTJkYjFj NDQyZTEzMDkxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA1LTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVmVyaWZpY2F0aW9u XSBBZGQgYWRkaXRpb25hbCBpbmxpbmUgYW5kIGJsb2NrIGNoZWNrcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4MjUyCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS81MTE0MDY4Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBOb3cgd2UgYWxzbyB0ZXN0IHRoZSBnZW9tZXRyeSBvZiB0aGUgYmxvY2tzIHdp dGggaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dHMuCisKKyAgICAgICAgKiBsYXlvdXQvVmVyaWZp Y2F0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Y2hlY2tGb3JNYXRjaGluZ1Rl eHRSdW5zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6dmVyaWZ5QW5kT3V0cHV0U3VidHJl ZSk6CisKIDIwMTktMDUtMjUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtWZXJpZmljYXRpb25dIEFkZCBhcmVFc3NlbnRpYWxseUVxdWFsIGZvciBMYXlv dXRSZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9WZXJpZmljYXRpb24uY3BwCmluZGV4IDk1ZTM2MDk3 MDE5YzFmYjNhZmEzNjM0NDJlZWQ2NzM0Mjg3ZGE5ZTEuLmNjZjQ2ZDg5MWI1YmFiZjY5MzRiYTIz YTU2ZDY2ZTc5YjZmMzYyNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9WZXJp ZmljYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9WZXJpZmljYXRpb24uY3Bw CkBAIC0xMDgsMTYgKzEwOCwxOSBAQCBzdGF0aWMgYm9vbCBjaGVja0Zvck1hdGNoaW5nTm9uVGV4 dFJ1bnMoY29uc3QgRGlzcGxheTo6UnVuJiBpbmxpbmVSdW4sIGNvbnN0IFdlYgogewogICAgIHJl dHVybiBhcmVFc3NlbnRpYWxseUVxdWFsKGlubGluZUJveC5sb2dpY2FsTGVmdCgpLCBpbmxpbmVS dW4ubG9naWNhbExlZnQoKSkKICAgICAgICAgJiYgYXJlRXNzZW50aWFsbHlFcXVhbChpbmxpbmVC b3gubG9naWNhbFJpZ2h0KCksIGlubGluZVJ1bi5sb2dpY2FsUmlnaHQoKSkKLSAgICAgICAgJiYg YXJlRXNzZW50aWFsbHlFcXVhbChpbmxpbmVCb3gubG9naWNhbEhlaWdodCgpLCBpbmxpbmVSdW4u bG9naWNhbEhlaWdodCgpKTsKKyAgICAgICAgJiYgYXJlRXNzZW50aWFsbHlFcXVhbChpbmxpbmVC b3gubG9naWNhbFRvcCgpLCBpbmxpbmVSdW4ubG9naWNhbFRvcCgpKQorICAgICAgICAmJiBhcmVF c3NlbnRpYWxseUVxdWFsKGlubGluZUJveC5sb2dpY2FsQm90dG9tKCksIGlubGluZVJ1bi5sb2dp Y2FsQm90dG9tKCkpOwogfQogCisKIHN0YXRpYyBib29sIGNoZWNrRm9yTWF0Y2hpbmdUZXh0UnVu cyhjb25zdCBEaXNwbGF5OjpSdW4mIGlubGluZVJ1biwgY29uc3QgSW5saW5lVGV4dEJveCYgaW5s aW5lVGV4dEJveCkKIHsKICAgICByZXR1cm4gYXJlRXNzZW50aWFsbHlFcXVhbChpbmxpbmVUZXh0 Qm94LmxvZ2ljYWxMZWZ0KCksIGlubGluZVJ1bi5sb2dpY2FsTGVmdCgpKQogICAgICAgICAmJiBh cmVFc3NlbnRpYWxseUVxdWFsKGlubGluZVRleHRCb3gubG9naWNhbFJpZ2h0KCksIGlubGluZVJ1 bi5sb2dpY2FsUmlnaHQoKSkKKyAgICAgICAgJiYgYXJlRXNzZW50aWFsbHlFcXVhbChpbmxpbmVU ZXh0Qm94LmxvZ2ljYWxUb3AoKSwgaW5saW5lUnVuLmxvZ2ljYWxUb3AoKSkKKyAgICAgICAgJiYg YXJlRXNzZW50aWFsbHlFcXVhbChpbmxpbmVUZXh0Qm94LmxvZ2ljYWxCb3R0b20oKSwgaW5saW5l UnVuLmxvZ2ljYWxCb3R0b20oKSkKICAgICAgICAgJiYgaW5saW5lVGV4dEJveC5zdGFydCgpID09 IGlubGluZVJ1bi50ZXh0Q29udGV4dCgpLT5zdGFydCgpCi0gICAgICAgICYmIChpbmxpbmVUZXh0 Qm94LmVuZCgpICsgMSkgPT0gaW5saW5lUnVuLnRleHRDb250ZXh0KCktPmVuZCgpCi0gICAgICAg ICYmIGFyZUVzc2VudGlhbGx5RXF1YWwoaW5saW5lVGV4dEJveC5sb2dpY2FsSGVpZ2h0KCksIGlu bGluZVJ1bi5sb2dpY2FsSGVpZ2h0KCkpOworICAgICAgICAmJiAoaW5saW5lVGV4dEJveC5lbmQo KSArIDEpID09IGlubGluZVJ1bi50ZXh0Q29udGV4dCgpLT5lbmQoKTsKIH0KIAogc3RhdGljIHZv aWQgY29sbGVjdEZsb3dCb3hTdWJ0cmVlKGNvbnN0IElubGluZUZsb3dCb3gmIGZsb3dib3gsIFZl Y3RvcjxXZWJDb3JlOjpJbmxpbmVCb3gqPiYgaW5saW5lQm94ZXMpCkBAIC0yNzUsNyArMjc4LDcg QEAgc3RhdGljIGJvb2wgdmVyaWZ5QW5kT3V0cHV0U3VidHJlZShUZXh0U3RyZWFtJiBzdHJlYW0s IGNvbnN0IExheW91dFN0YXRlJiBjb250ZXgKICAgICAgICAgcmV0dXJuIG1pc210YWNoaW5nR2Vv bWV0cnk7CiAKICAgICBhdXRvJiBjb250YWluZXIgPSBkb3duY2FzdDxDb250YWluZXI+KGxheW91 dEJveCk7Ci0gICAgYXV0byogY2hpbGRCb3ggPSBjb250YWluZXIuZmlyc3RDaGlsZCgpOworICAg IGF1dG8qIGNoaWxkTGF5b3V0Qm94ID0gY29udGFpbmVyLmZpcnN0Q2hpbGQoKTsKICAgICBhdXRv KiBjaGlsZFJlbmRlcmVyID0gcmVuZGVyZXIuZmlyc3RDaGlsZCgpOwogCiAgICAgd2hpbGUgKGNo aWxkUmVuZGVyZXIpIHsKQEAgLTI4NCwyMyArMjg3LDI3IEBAIHN0YXRpYyBib29sIHZlcmlmeUFu ZE91dHB1dFN1YnRyZWUoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBMYXlvdXRTdGF0ZSYgY29u dGV4CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCi0gICAgICAgIGlmICghY2hp bGRCb3gpIHsKKyAgICAgICAgaWYgKCFjaGlsZExheW91dEJveCkgewogICAgICAgICAgICAgc3Ry ZWFtICA8PCAiVHJlZXMgYXJlIG91dCBvZiBzeW5jISI7CiAgICAgICAgICAgICBzdHJlYW0ubmV4 dExpbmUoKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAKLSAgICAgICAg aWYgKGlzPFJlbmRlckJsb2NrRmxvdz4oKmNoaWxkUmVuZGVyZXIpICYmIGNoaWxkQm94LT5lc3Rh Ymxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKKyAgICAgICAgaWYgKGlzPFJlbmRl ckJsb2NrRmxvdz4oKmNoaWxkUmVuZGVyZXIpICYmIGNoaWxkTGF5b3V0Qm94LT5lc3RhYmxpc2hl c0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKICAgICAgICAgICAgIEFTU0VSVChjaGlsZFJl bmRlcmVyLT5jaGlsZHJlbklubGluZSgpKTsKKyAgICAgICAgICAgIGF1dG8gbWlzbXRhY2hpbmdH ZW9tZXRyeSA9IG91dHB1dE1pc21hdGNoaW5nQmxvY2tCb3hJbmZvcm1hdGlvbklmTmVlZGVkKHN0 cmVhbSwgY29udGV4dCwgZG93bmNhc3Q8UmVuZGVyQm94PigqY2hpbGRSZW5kZXJlciksICpjaGls ZExheW91dEJveCk7CisgICAgICAgICAgICBpZiAobWlzbXRhY2hpbmdHZW9tZXRyeSkKKyAgICAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKwogICAgICAgICAgICAgYXV0byYgYmxvY2tGbG93ID0g ZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PigqY2hpbGRSZW5kZXJlcik7Ci0gICAgICAgICAgICBh dXRvJiBmb3JtYXR0aW5nUm9vdCA9IGRvd25jYXN0PENvbnRhaW5lcj4oKmNoaWxkQm94KTsKKyAg ICAgICAgICAgIGF1dG8mIGZvcm1hdHRpbmdSb290ID0gZG93bmNhc3Q8Q29udGFpbmVyPigqY2hp bGRMYXlvdXRCb3gpOwogICAgICAgICAgICAgbWlzbXRhY2hpbmdHZW9tZXRyeSB8PSBibG9ja0Zs b3cubGluZUxheW91dFBhdGgoKSA9PSBSZW5kZXJCbG9ja0Zsb3c6OlNpbXBsZUxpbmVzUGF0aCA/ IG91dHB1dE1pc21hdGNoaW5nU2ltcGxlTGluZUluZm9ybWF0aW9uSWZOZWVkZWQoc3RyZWFtLCBj b250ZXh0LCBibG9ja0Zsb3csIGZvcm1hdHRpbmdSb290KSA6IG91dHB1dE1pc21hdGNoaW5nQ29t cGxleExpbmVJbmZvcm1hdGlvbklmTmVlZGVkKHN0cmVhbSwgY29udGV4dCwgYmxvY2tGbG93LCBm b3JtYXR0aW5nUm9vdCk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBhdXRvIG1pc21h dGNoaW5nU3VidHJlZUdlb21ldHJ5ID0gdmVyaWZ5QW5kT3V0cHV0U3VidHJlZShzdHJlYW0sIGNv bnRleHQsIGRvd25jYXN0PFJlbmRlckJveD4oKmNoaWxkUmVuZGVyZXIpLCAqY2hpbGRCb3gpOwor ICAgICAgICAgICAgYXV0byBtaXNtYXRjaGluZ1N1YnRyZWVHZW9tZXRyeSA9IHZlcmlmeUFuZE91 dHB1dFN1YnRyZWUoc3RyZWFtLCBjb250ZXh0LCBkb3duY2FzdDxSZW5kZXJCb3g+KCpjaGlsZFJl bmRlcmVyKSwgKmNoaWxkTGF5b3V0Qm94KTsKICAgICAgICAgICAgIG1pc210YWNoaW5nR2VvbWV0 cnkgfD0gbWlzbWF0Y2hpbmdTdWJ0cmVlR2VvbWV0cnk7CiAgICAgICAgIH0KIAotICAgICAgICBj aGlsZEJveCA9IGNoaWxkQm94LT5uZXh0U2libGluZygpOworICAgICAgICBjaGlsZExheW91dEJv eCA9IGNoaWxkTGF5b3V0Qm94LT5uZXh0U2libGluZygpOwogICAgICAgICBjaGlsZFJlbmRlcmVy ID0gY2hpbGRSZW5kZXJlci0+bmV4dFNpYmxpbmcoKTsKICAgICB9CiAK 370760 2019-05-28 10:27:35 -0700 2019-05-28 10:27:35 -0700 Patch bug-198252-20190528102734.patch text/plain 4774 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1ODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGVmZWY3MGRlNjQzY2M5 YjhmZjExM2ZmNGEzMWJhYmEzNWI4MDBmYy4uYTViM2NmOWIwOTg5YTg3OTg3MmVhY2VkY2U3YWQz MjM2MWY0MTM1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA1LTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVmVyaWZpY2F0aW9u XSBBZGQgYWRkaXRpb25hbCBpbmxpbmUgYW5kIGJsb2NrIGNoZWNrcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4MjUyCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS81MTE0MDY4Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4K KworICAgICAgICBOb3cgd2UgYWxzbyB0ZXN0IHRoZSBnZW9tZXRyeSBvZiB0aGUgYmxvY2tzIHdp dGggaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dHMuCisKKyAgICAgICAgKiBsYXlvdXQvVmVyaWZp Y2F0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Y2hlY2tGb3JNYXRjaGluZ1Rl eHRSdW5zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6dmVyaWZ5QW5kT3V0cHV0U3VidHJl ZSk6CisKIDIwMTktMDUtMjggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtJRkNdIERlY291cGxlIGxpbmUgbGF5b3V0IGFuZCBwcm9jZXNzaW5nIGlubGlu ZSBydW5zLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L1ZlcmlmaWNhdGlvbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNwcAppbmRleCA5NWUzNjA5 NzAxOWMxZmIzYWZhMzYzNDQyZWVkNjczNDI4N2RhOWUxLi5jY2Y0NmQ4OTFiNWJhYmY2OTM0YmEy M2E1NmQ2NmU3OWI2ZjM2MjQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVy aWZpY2F0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNw cApAQCAtMTA4LDE2ICsxMDgsMTkgQEAgc3RhdGljIGJvb2wgY2hlY2tGb3JNYXRjaGluZ05vblRl eHRSdW5zKGNvbnN0IERpc3BsYXk6OlJ1biYgaW5saW5lUnVuLCBjb25zdCBXZWIKIHsKICAgICBy ZXR1cm4gYXJlRXNzZW50aWFsbHlFcXVhbChpbmxpbmVCb3gubG9naWNhbExlZnQoKSwgaW5saW5l UnVuLmxvZ2ljYWxMZWZ0KCkpCiAgICAgICAgICYmIGFyZUVzc2VudGlhbGx5RXF1YWwoaW5saW5l Qm94LmxvZ2ljYWxSaWdodCgpLCBpbmxpbmVSdW4ubG9naWNhbFJpZ2h0KCkpCi0gICAgICAgICYm IGFyZUVzc2VudGlhbGx5RXF1YWwoaW5saW5lQm94LmxvZ2ljYWxIZWlnaHQoKSwgaW5saW5lUnVu LmxvZ2ljYWxIZWlnaHQoKSk7CisgICAgICAgICYmIGFyZUVzc2VudGlhbGx5RXF1YWwoaW5saW5l Qm94LmxvZ2ljYWxUb3AoKSwgaW5saW5lUnVuLmxvZ2ljYWxUb3AoKSkKKyAgICAgICAgJiYgYXJl RXNzZW50aWFsbHlFcXVhbChpbmxpbmVCb3gubG9naWNhbEJvdHRvbSgpLCBpbmxpbmVSdW4ubG9n aWNhbEJvdHRvbSgpKTsKIH0KIAorCiBzdGF0aWMgYm9vbCBjaGVja0Zvck1hdGNoaW5nVGV4dFJ1 bnMoY29uc3QgRGlzcGxheTo6UnVuJiBpbmxpbmVSdW4sIGNvbnN0IElubGluZVRleHRCb3gmIGlu bGluZVRleHRCb3gpCiB7CiAgICAgcmV0dXJuIGFyZUVzc2VudGlhbGx5RXF1YWwoaW5saW5lVGV4 dEJveC5sb2dpY2FsTGVmdCgpLCBpbmxpbmVSdW4ubG9naWNhbExlZnQoKSkKICAgICAgICAgJiYg YXJlRXNzZW50aWFsbHlFcXVhbChpbmxpbmVUZXh0Qm94LmxvZ2ljYWxSaWdodCgpLCBpbmxpbmVS dW4ubG9naWNhbFJpZ2h0KCkpCisgICAgICAgICYmIGFyZUVzc2VudGlhbGx5RXF1YWwoaW5saW5l VGV4dEJveC5sb2dpY2FsVG9wKCksIGlubGluZVJ1bi5sb2dpY2FsVG9wKCkpCisgICAgICAgICYm IGFyZUVzc2VudGlhbGx5RXF1YWwoaW5saW5lVGV4dEJveC5sb2dpY2FsQm90dG9tKCksIGlubGlu ZVJ1bi5sb2dpY2FsQm90dG9tKCkpCiAgICAgICAgICYmIGlubGluZVRleHRCb3guc3RhcnQoKSA9 PSBpbmxpbmVSdW4udGV4dENvbnRleHQoKS0+c3RhcnQoKQotICAgICAgICAmJiAoaW5saW5lVGV4 dEJveC5lbmQoKSArIDEpID09IGlubGluZVJ1bi50ZXh0Q29udGV4dCgpLT5lbmQoKQotICAgICAg ICAmJiBhcmVFc3NlbnRpYWxseUVxdWFsKGlubGluZVRleHRCb3gubG9naWNhbEhlaWdodCgpLCBp bmxpbmVSdW4ubG9naWNhbEhlaWdodCgpKTsKKyAgICAgICAgJiYgKGlubGluZVRleHRCb3guZW5k KCkgKyAxKSA9PSBpbmxpbmVSdW4udGV4dENvbnRleHQoKS0+ZW5kKCk7CiB9CiAKIHN0YXRpYyB2 b2lkIGNvbGxlY3RGbG93Qm94U3VidHJlZShjb25zdCBJbmxpbmVGbG93Qm94JiBmbG93Ym94LCBW ZWN0b3I8V2ViQ29yZTo6SW5saW5lQm94Kj4mIGlubGluZUJveGVzKQpAQCAtMjc1LDcgKzI3OCw3 IEBAIHN0YXRpYyBib29sIHZlcmlmeUFuZE91dHB1dFN1YnRyZWUoVGV4dFN0cmVhbSYgc3RyZWFt LCBjb25zdCBMYXlvdXRTdGF0ZSYgY29udGV4CiAgICAgICAgIHJldHVybiBtaXNtdGFjaGluZ0dl b21ldHJ5OwogCiAgICAgYXV0byYgY29udGFpbmVyID0gZG93bmNhc3Q8Q29udGFpbmVyPihsYXlv dXRCb3gpOwotICAgIGF1dG8qIGNoaWxkQm94ID0gY29udGFpbmVyLmZpcnN0Q2hpbGQoKTsKKyAg ICBhdXRvKiBjaGlsZExheW91dEJveCA9IGNvbnRhaW5lci5maXJzdENoaWxkKCk7CiAgICAgYXV0 byogY2hpbGRSZW5kZXJlciA9IHJlbmRlcmVyLmZpcnN0Q2hpbGQoKTsKIAogICAgIHdoaWxlIChj aGlsZFJlbmRlcmVyKSB7CkBAIC0yODQsMjMgKzI4NywyNyBAQCBzdGF0aWMgYm9vbCB2ZXJpZnlB bmRPdXRwdXRTdWJ0cmVlKFRleHRTdHJlYW0mIHN0cmVhbSwgY29uc3QgTGF5b3V0U3RhdGUmIGNv bnRleAogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIWNo aWxkQm94KSB7CisgICAgICAgIGlmICghY2hpbGRMYXlvdXRCb3gpIHsKICAgICAgICAgICAgIHN0 cmVhbSAgPDwgIlRyZWVzIGFyZSBvdXQgb2Ygc3luYyEiOwogICAgICAgICAgICAgc3RyZWFtLm5l eHRMaW5lKCk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogCi0gICAgICAg IGlmIChpczxSZW5kZXJCbG9ja0Zsb3c+KCpjaGlsZFJlbmRlcmVyKSAmJiBjaGlsZEJveC0+ZXN0 YWJsaXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgpKSB7CisgICAgICAgIGlmIChpczxSZW5k ZXJCbG9ja0Zsb3c+KCpjaGlsZFJlbmRlcmVyKSAmJiBjaGlsZExheW91dEJveC0+ZXN0YWJsaXNo ZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgpKSB7CiAgICAgICAgICAgICBBU1NFUlQoY2hpbGRS ZW5kZXJlci0+Y2hpbGRyZW5JbmxpbmUoKSk7CisgICAgICAgICAgICBhdXRvIG1pc210YWNoaW5n R2VvbWV0cnkgPSBvdXRwdXRNaXNtYXRjaGluZ0Jsb2NrQm94SW5mb3JtYXRpb25JZk5lZWRlZChz dHJlYW0sIGNvbnRleHQsIGRvd25jYXN0PFJlbmRlckJveD4oKmNoaWxkUmVuZGVyZXIpLCAqY2hp bGRMYXlvdXRCb3gpOworICAgICAgICAgICAgaWYgKG1pc210YWNoaW5nR2VvbWV0cnkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICAgICAgICAgIGF1dG8mIGJsb2NrRmxvdyA9 IGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKmNoaWxkUmVuZGVyZXIpOwotICAgICAgICAgICAg YXV0byYgZm9ybWF0dGluZ1Jvb3QgPSBkb3duY2FzdDxDb250YWluZXI+KCpjaGlsZEJveCk7Cisg ICAgICAgICAgICBhdXRvJiBmb3JtYXR0aW5nUm9vdCA9IGRvd25jYXN0PENvbnRhaW5lcj4oKmNo aWxkTGF5b3V0Qm94KTsKICAgICAgICAgICAgIG1pc210YWNoaW5nR2VvbWV0cnkgfD0gYmxvY2tG bG93LmxpbmVMYXlvdXRQYXRoKCkgPT0gUmVuZGVyQmxvY2tGbG93OjpTaW1wbGVMaW5lc1BhdGgg PyBvdXRwdXRNaXNtYXRjaGluZ1NpbXBsZUxpbmVJbmZvcm1hdGlvbklmTmVlZGVkKHN0cmVhbSwg Y29udGV4dCwgYmxvY2tGbG93LCBmb3JtYXR0aW5nUm9vdCkgOiBvdXRwdXRNaXNtYXRjaGluZ0Nv bXBsZXhMaW5lSW5mb3JtYXRpb25JZk5lZWRlZChzdHJlYW0sIGNvbnRleHQsIGJsb2NrRmxvdywg Zm9ybWF0dGluZ1Jvb3QpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYXV0byBtaXNt YXRjaGluZ1N1YnRyZWVHZW9tZXRyeSA9IHZlcmlmeUFuZE91dHB1dFN1YnRyZWUoc3RyZWFtLCBj b250ZXh0LCBkb3duY2FzdDxSZW5kZXJCb3g+KCpjaGlsZFJlbmRlcmVyKSwgKmNoaWxkQm94KTsK KyAgICAgICAgICAgIGF1dG8gbWlzbWF0Y2hpbmdTdWJ0cmVlR2VvbWV0cnkgPSB2ZXJpZnlBbmRP dXRwdXRTdWJ0cmVlKHN0cmVhbSwgY29udGV4dCwgZG93bmNhc3Q8UmVuZGVyQm94PigqY2hpbGRS ZW5kZXJlciksICpjaGlsZExheW91dEJveCk7CiAgICAgICAgICAgICBtaXNtdGFjaGluZ0dlb21l dHJ5IHw9IG1pc21hdGNoaW5nU3VidHJlZUdlb21ldHJ5OwogICAgICAgICB9CiAKLSAgICAgICAg Y2hpbGRCb3ggPSBjaGlsZEJveC0+bmV4dFNpYmxpbmcoKTsKKyAgICAgICAgY2hpbGRMYXlvdXRC b3ggPSBjaGlsZExheW91dEJveC0+bmV4dFNpYmxpbmcoKTsKICAgICAgICAgY2hpbGRSZW5kZXJl ciA9IGNoaWxkUmVuZGVyZXItPm5leHRTaWJsaW5nKCk7CiAgICAgfQogCg==