137331 2014-10-01 19:46:34 -0700 Use is<>() / downcast<>() for CSSBasicShape objects 2014-10-02 15:53:27 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137056 1 cdumez cdumez benjamin commit-queue gyuyoung.kim kling rniwa oldest_to_newest 1038761 0 cdumez 2014-10-01 19:46:34 -0700 Use is<>() / downcast<>() for CSSBasicShape objects 1038763 1 239080 cdumez 2014-10-01 19:55:58 -0700 Created attachment 239080 Patch 1038994 2 239144 cdumez 2014-10-02 14:58:31 -0700 Created attachment 239144 Patch 1039005 3 239144 kling 2014-10-02 15:15:16 -0700 Comment on attachment 239144 Patch r=me 1039015 4 239144 commit-queue 2014-10-02 15:53:22 -0700 Comment on attachment 239144 Patch Clearing flags on attachment: 239144 Committed r174236: <http://trac.webkit.org/changeset/174236> 1039016 5 commit-queue 2014-10-02 15:53:27 -0700 All reviewed patches have been landed. Closing bug. 239080 2014-10-01 19:55:58 -0700 2014-10-02 14:58:28 -0700 Patch bug-137331-20141001195559.patch text/plain 11533 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDY3N2E0MTliZDcyM2Qy NDA4MzljNTMxMmY3MjE5ZDY3OGVmNDg2My4uYzFlMjc5ZWFhYmIyZjc2OGM0YmQ1NDc0OTdiYzQ4 N2NkNWJkN2Q5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTEwLTAxICBDaHJp c3RvcGhlIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgaXM8PigpIC8g ZG93bmNhc3Q8PigpIGZvciBDU1NCYXNpY1NoYXBlIG9iamVjdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzMzMQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBpczw+KCkgLyBkb3duY2FzdDw+KCkg Zm9yIENTU0Jhc2ljU2hhcGUgb2JqZWN0cy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJl aGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGNzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmJhc2ljU2hhcGVGb3JWYWx1ZSk6CisgICAgICAgICogY3NzL0NT U0Jhc2ljU2hhcGVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0Jhc2ljU2hhcGVDaXJjbGU6 OmVxdWFscyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NCYXNpY1NoYXBlRWxsaXBzZTo6ZXF1YWxz KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0Jhc2ljU2hhcGVQb2x5Z29uOjplcXVhbHMpOgorICAg ICAgICAoV2ViQ29yZTo6Q1NTQmFzaWNTaGFwZUluc2V0OjplcXVhbHMpOgorICAgICAgICAqIGNz cy9DU1NCYXNpY1NoYXBlcy5oOgorCiAyMDE0LTEwLTAxICBSaWsgQ2FiYW5pZXIgIDxjYWJhbmll ckBhZG9iZS5jb20+CiAKICAgICAgICAgQWRkIHN1cHBvcnQgZm9yIG1pZHBvaW50IHRvIENTUyBn cmFkaWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rp b25zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcAppbmRl eCAwNGViYWZlODA1ZTFkZjY1N2I3Y2E0MzAzYTdjMjEyMDI4MTEzNjE2Li40ZmNmNGNlZmIyYjky NmE2ZmQ1NWJkYjhhNzMwNDk4ZjAyMzVjYWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0Jhc2lj U2hhcGVGdW5jdGlvbnMuY3BwCkBAIC0yMDUsMzUgKzIwNSwzNSBAQCBQYXNzUmVmUHRyPEJhc2lj U2hhcGU+IGJhc2ljU2hhcGVGb3JWYWx1ZShjb25zdCBDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRh JiBjb252ZQogCiAgICAgc3dpdGNoIChiYXNpY1NoYXBlVmFsdWUtPnR5cGUoKSkgewogICAgIGNh c2UgQ1NTQmFzaWNTaGFwZTo6Q1NTQmFzaWNTaGFwZUNpcmNsZVR5cGU6IHsKLSAgICAgICAgY29u c3QgQ1NTQmFzaWNTaGFwZUNpcmNsZSogY2lyY2xlVmFsdWUgPSB0b0NTU0Jhc2ljU2hhcGVDaXJj bGUoYmFzaWNTaGFwZVZhbHVlKTsKKyAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZUNpcmNsZSYg Y2lyY2xlVmFsdWUgPSBkb3duY2FzdDxDU1NCYXNpY1NoYXBlQ2lyY2xlPigqYmFzaWNTaGFwZVZh bHVlKTsKICAgICAgICAgUmVmUHRyPEJhc2ljU2hhcGVDaXJjbGU+IGNpcmNsZSA9IEJhc2ljU2hh cGVDaXJjbGU6OmNyZWF0ZSgpOwogCi0gICAgICAgIGNpcmNsZS0+c2V0Q2VudGVyWChjb252ZXJ0 VG9DZW50ZXJDb29yZGluYXRlKGNvbnZlcnNpb25EYXRhLCBjaXJjbGVWYWx1ZS0+Y2VudGVyWCgp KSk7Ci0gICAgICAgIGNpcmNsZS0+c2V0Q2VudGVyWShjb252ZXJ0VG9DZW50ZXJDb29yZGluYXRl KGNvbnZlcnNpb25EYXRhLCBjaXJjbGVWYWx1ZS0+Y2VudGVyWSgpKSk7Ci0gICAgICAgIGNpcmNs ZS0+c2V0UmFkaXVzKGNzc1ZhbHVlVG9CYXNpY1NoYXBlUmFkaXVzKGNvbnZlcnNpb25EYXRhLCBj aXJjbGVWYWx1ZS0+cmFkaXVzKCkpKTsKKyAgICAgICAgY2lyY2xlLT5zZXRDZW50ZXJYKGNvbnZl cnRUb0NlbnRlckNvb3JkaW5hdGUoY29udmVyc2lvbkRhdGEsIGNpcmNsZVZhbHVlLmNlbnRlclgo KSkpOworICAgICAgICBjaXJjbGUtPnNldENlbnRlclkoY29udmVydFRvQ2VudGVyQ29vcmRpbmF0 ZShjb252ZXJzaW9uRGF0YSwgY2lyY2xlVmFsdWUuY2VudGVyWSgpKSk7CisgICAgICAgIGNpcmNs ZS0+c2V0UmFkaXVzKGNzc1ZhbHVlVG9CYXNpY1NoYXBlUmFkaXVzKGNvbnZlcnNpb25EYXRhLCBj aXJjbGVWYWx1ZS5yYWRpdXMoKSkpOwogCiAgICAgICAgIGJhc2ljU2hhcGUgPSBjaXJjbGUucmVs ZWFzZSgpOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgY2FzZSBDU1NCYXNpY1NoYXBlOjpD U1NCYXNpY1NoYXBlRWxsaXBzZVR5cGU6IHsKLSAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZUVs bGlwc2UqIGVsbGlwc2VWYWx1ZSA9IHRvQ1NTQmFzaWNTaGFwZUVsbGlwc2UoYmFzaWNTaGFwZVZh bHVlKTsKKyAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZUVsbGlwc2UmIGVsbGlwc2VWYWx1ZSA9 IGRvd25jYXN0PENTU0Jhc2ljU2hhcGVFbGxpcHNlPigqYmFzaWNTaGFwZVZhbHVlKTsKICAgICAg ICAgUmVmUHRyPEJhc2ljU2hhcGVFbGxpcHNlPiBlbGxpcHNlID0gQmFzaWNTaGFwZUVsbGlwc2U6 OmNyZWF0ZSgpOwogCi0gICAgICAgIGVsbGlwc2UtPnNldENlbnRlclgoY29udmVydFRvQ2VudGVy Q29vcmRpbmF0ZShjb252ZXJzaW9uRGF0YSwgZWxsaXBzZVZhbHVlLT5jZW50ZXJYKCkpKTsKLSAg ICAgICAgZWxsaXBzZS0+c2V0Q2VudGVyWShjb252ZXJ0VG9DZW50ZXJDb29yZGluYXRlKGNvbnZl cnNpb25EYXRhLCBlbGxpcHNlVmFsdWUtPmNlbnRlclkoKSkpOworICAgICAgICBlbGxpcHNlLT5z ZXRDZW50ZXJYKGNvbnZlcnRUb0NlbnRlckNvb3JkaW5hdGUoY29udmVyc2lvbkRhdGEsIGVsbGlw c2VWYWx1ZS5jZW50ZXJYKCkpKTsKKyAgICAgICAgZWxsaXBzZS0+c2V0Q2VudGVyWShjb252ZXJ0 VG9DZW50ZXJDb29yZGluYXRlKGNvbnZlcnNpb25EYXRhLCBlbGxpcHNlVmFsdWUuY2VudGVyWSgp KSk7CiAKLSAgICAgICAgZWxsaXBzZS0+c2V0UmFkaXVzWChjc3NWYWx1ZVRvQmFzaWNTaGFwZVJh ZGl1cyhjb252ZXJzaW9uRGF0YSwgZWxsaXBzZVZhbHVlLT5yYWRpdXNYKCkpKTsKLSAgICAgICAg ZWxsaXBzZS0+c2V0UmFkaXVzWShjc3NWYWx1ZVRvQmFzaWNTaGFwZVJhZGl1cyhjb252ZXJzaW9u RGF0YSwgZWxsaXBzZVZhbHVlLT5yYWRpdXNZKCkpKTsKKyAgICAgICAgZWxsaXBzZS0+c2V0UmFk aXVzWChjc3NWYWx1ZVRvQmFzaWNTaGFwZVJhZGl1cyhjb252ZXJzaW9uRGF0YSwgZWxsaXBzZVZh bHVlLnJhZGl1c1goKSkpOworICAgICAgICBlbGxpcHNlLT5zZXRSYWRpdXNZKGNzc1ZhbHVlVG9C YXNpY1NoYXBlUmFkaXVzKGNvbnZlcnNpb25EYXRhLCBlbGxpcHNlVmFsdWUucmFkaXVzWSgpKSk7 CiAKICAgICAgICAgYmFzaWNTaGFwZSA9IGVsbGlwc2UucmVsZWFzZSgpOwogICAgICAgICBicmVh azsKICAgICB9CiAgICAgY2FzZSBDU1NCYXNpY1NoYXBlOjpDU1NCYXNpY1NoYXBlUG9seWdvblR5 cGU6IHsKLSAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZVBvbHlnb24qIHBvbHlnb25WYWx1ZSA9 IHRvQ1NTQmFzaWNTaGFwZVBvbHlnb24oYmFzaWNTaGFwZVZhbHVlKTsKKyAgICAgICAgY29uc3Qg Q1NTQmFzaWNTaGFwZVBvbHlnb24mIHBvbHlnb25WYWx1ZSA9IGRvd25jYXN0PENTU0Jhc2ljU2hh cGVQb2x5Z29uPigqYmFzaWNTaGFwZVZhbHVlKTsKICAgICAgICAgUmVmUHRyPEJhc2ljU2hhcGVQ b2x5Z29uPiBwb2x5Z29uID0gQmFzaWNTaGFwZVBvbHlnb246OmNyZWF0ZSgpOwogCi0gICAgICAg IHBvbHlnb24tPnNldFdpbmRSdWxlKHBvbHlnb25WYWx1ZS0+d2luZFJ1bGUoKSk7Ci0gICAgICAg IGNvbnN0IFZlY3RvcjxSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+PiYgdmFsdWVzID0gcG9seWdv blZhbHVlLT52YWx1ZXMoKTsKKyAgICAgICAgcG9seWdvbi0+c2V0V2luZFJ1bGUocG9seWdvblZh bHVlLndpbmRSdWxlKCkpOworICAgICAgICBjb25zdCBWZWN0b3I8UmVmUHRyPENTU1ByaW1pdGl2 ZVZhbHVlPj4mIHZhbHVlcyA9IHBvbHlnb25WYWx1ZS52YWx1ZXMoKTsKICAgICAgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IHZhbHVlcy5zaXplKCk7IGkgKz0gMikKICAgICAgICAgICAgIHBv bHlnb24tPmFwcGVuZFBvaW50KGNvbnZlcnRUb0xlbmd0aChjb252ZXJzaW9uRGF0YSwgdmFsdWVz LmF0KGkpLmdldCgpKSwgY29udmVydFRvTGVuZ3RoKGNvbnZlcnNpb25EYXRhLCB2YWx1ZXMuYXQo aSArIDEpLmdldCgpKSk7CiAKQEAgLTI0MSwxOCArMjQxLDE4IEBAIFBhc3NSZWZQdHI8QmFzaWNT aGFwZT4gYmFzaWNTaGFwZUZvclZhbHVlKGNvbnN0IENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEm IGNvbnZlCiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIENTU0Jhc2ljU2hhcGU6OkNT U0Jhc2ljU2hhcGVJbnNldFR5cGU6IHsKLSAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZUluc2V0 KiByZWN0VmFsdWUgPSB0b0NTU0Jhc2ljU2hhcGVJbnNldChiYXNpY1NoYXBlVmFsdWUpOworICAg ICAgICBjb25zdCBDU1NCYXNpY1NoYXBlSW5zZXQmIHJlY3RWYWx1ZSA9IGRvd25jYXN0PENTU0Jh c2ljU2hhcGVJbnNldD4oKmJhc2ljU2hhcGVWYWx1ZSk7CiAgICAgICAgIFJlZlB0cjxCYXNpY1No YXBlSW5zZXQ+IHJlY3QgPSBCYXNpY1NoYXBlSW5zZXQ6OmNyZWF0ZSgpOwogCi0gICAgICAgIHJl Y3QtPnNldFRvcChjb252ZXJ0VG9MZW5ndGgoY29udmVyc2lvbkRhdGEsIHJlY3RWYWx1ZS0+dG9w KCkpKTsKLSAgICAgICAgcmVjdC0+c2V0UmlnaHQoY29udmVydFRvTGVuZ3RoKGNvbnZlcnNpb25E YXRhLCByZWN0VmFsdWUtPnJpZ2h0KCkpKTsKLSAgICAgICAgcmVjdC0+c2V0Qm90dG9tKGNvbnZl cnRUb0xlbmd0aChjb252ZXJzaW9uRGF0YSwgcmVjdFZhbHVlLT5ib3R0b20oKSkpOwotICAgICAg ICByZWN0LT5zZXRMZWZ0KGNvbnZlcnRUb0xlbmd0aChjb252ZXJzaW9uRGF0YSwgcmVjdFZhbHVl LT5sZWZ0KCkpKTsKKyAgICAgICAgcmVjdC0+c2V0VG9wKGNvbnZlcnRUb0xlbmd0aChjb252ZXJz aW9uRGF0YSwgcmVjdFZhbHVlLnRvcCgpKSk7CisgICAgICAgIHJlY3QtPnNldFJpZ2h0KGNvbnZl cnRUb0xlbmd0aChjb252ZXJzaW9uRGF0YSwgcmVjdFZhbHVlLnJpZ2h0KCkpKTsKKyAgICAgICAg cmVjdC0+c2V0Qm90dG9tKGNvbnZlcnRUb0xlbmd0aChjb252ZXJzaW9uRGF0YSwgcmVjdFZhbHVl LmJvdHRvbSgpKSk7CisgICAgICAgIHJlY3QtPnNldExlZnQoY29udmVydFRvTGVuZ3RoKGNvbnZl cnNpb25EYXRhLCByZWN0VmFsdWUubGVmdCgpKSk7CiAKLSAgICAgICAgcmVjdC0+c2V0VG9wTGVm dFJhZGl1cyhjb252ZXJ0VG9MZW5ndGhTaXplKGNvbnZlcnNpb25EYXRhLCByZWN0VmFsdWUtPnRv cExlZnRSYWRpdXMoKSkpOwotICAgICAgICByZWN0LT5zZXRUb3BSaWdodFJhZGl1cyhjb252ZXJ0 VG9MZW5ndGhTaXplKGNvbnZlcnNpb25EYXRhLCByZWN0VmFsdWUtPnRvcFJpZ2h0UmFkaXVzKCkp KTsKLSAgICAgICAgcmVjdC0+c2V0Qm90dG9tUmlnaHRSYWRpdXMoY29udmVydFRvTGVuZ3RoU2l6 ZShjb252ZXJzaW9uRGF0YSwgcmVjdFZhbHVlLT5ib3R0b21SaWdodFJhZGl1cygpKSk7Ci0gICAg ICAgIHJlY3QtPnNldEJvdHRvbUxlZnRSYWRpdXMoY29udmVydFRvTGVuZ3RoU2l6ZShjb252ZXJz aW9uRGF0YSwgcmVjdFZhbHVlLT5ib3R0b21MZWZ0UmFkaXVzKCkpKTsKKyAgICAgICAgcmVjdC0+ c2V0VG9wTGVmdFJhZGl1cyhjb252ZXJ0VG9MZW5ndGhTaXplKGNvbnZlcnNpb25EYXRhLCByZWN0 VmFsdWUudG9wTGVmdFJhZGl1cygpKSk7CisgICAgICAgIHJlY3QtPnNldFRvcFJpZ2h0UmFkaXVz KGNvbnZlcnRUb0xlbmd0aFNpemUoY29udmVyc2lvbkRhdGEsIHJlY3RWYWx1ZS50b3BSaWdodFJh ZGl1cygpKSk7CisgICAgICAgIHJlY3QtPnNldEJvdHRvbVJpZ2h0UmFkaXVzKGNvbnZlcnRUb0xl bmd0aFNpemUoY29udmVyc2lvbkRhdGEsIHJlY3RWYWx1ZS5ib3R0b21SaWdodFJhZGl1cygpKSk7 CisgICAgICAgIHJlY3QtPnNldEJvdHRvbUxlZnRSYWRpdXMoY29udmVydFRvTGVuZ3RoU2l6ZShj b252ZXJzaW9uRGF0YSwgcmVjdFZhbHVlLmJvdHRvbUxlZnRSYWRpdXMoKSkpOwogCiAgICAgICAg IGJhc2ljU2hhcGUgPSByZWN0LnJlbGVhc2UoKTsKICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQmFzaWNTaGFwZXMuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0Jhc2ljU2hhcGVzLmNwcAppbmRleCA2MTVjMGY1ZDFiM2VkZjU0YjUxZWIxOTJlN2Vm MjA4MjI3ODI0ODJkLi5hNDY4Mzg2YWRhODM3ZTU0MGYzYzM5OTM1MTNlMWI5NDk2ZWJhNWY3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQmFzaWNTaGFwZXMuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NCYXNpY1NoYXBlcy5jcHAKQEAgLTEyNSwxMCArMTI1LDEwIEBA IFN0cmluZyBDU1NCYXNpY1NoYXBlQ2lyY2xlOjpjc3NUZXh0KCkgY29uc3QKIAogYm9vbCBDU1NC YXNpY1NoYXBlQ2lyY2xlOjplcXVhbHMoY29uc3QgQ1NTQmFzaWNTaGFwZSYgc2hhcGUpIGNvbnN0 CiB7Ci0gICAgaWYgKHNoYXBlLnR5cGUoKSAhPSBDU1NCYXNpY1NoYXBlQ2lyY2xlVHlwZSkKKyAg ICBpZiAoIWlzPENTU0Jhc2ljU2hhcGVDaXJjbGU+KHNoYXBlKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgY29uc3QgQ1NTQmFzaWNTaGFwZUNpcmNsZSYgb3RoZXIgPSB0b0NTU0Jhc2lj U2hhcGVDaXJjbGUoc2hhcGUpOworICAgIGNvbnN0IENTU0Jhc2ljU2hhcGVDaXJjbGUmIG90aGVy ID0gZG93bmNhc3Q8Q1NTQmFzaWNTaGFwZUNpcmNsZT4oc2hhcGUpOwogICAgIHJldHVybiBjb21w YXJlQ1NTVmFsdWVQdHIobV9jZW50ZXJYLCBvdGhlci5tX2NlbnRlclgpCiAgICAgICAgICYmIGNv bXBhcmVDU1NWYWx1ZVB0cihtX2NlbnRlclksIG90aGVyLm1fY2VudGVyWSkKICAgICAgICAgJiYg Y29tcGFyZUNTU1ZhbHVlUHRyKG1fcmFkaXVzLCBvdGhlci5tX3JhZGl1cykKQEAgLTE5OCwxMCAr MTk4LDEwIEBAIFN0cmluZyBDU1NCYXNpY1NoYXBlRWxsaXBzZTo6Y3NzVGV4dCgpIGNvbnN0CiAK IGJvb2wgQ1NTQmFzaWNTaGFwZUVsbGlwc2U6OmVxdWFscyhjb25zdCBDU1NCYXNpY1NoYXBlJiBz aGFwZSkgY29uc3QKIHsKLSAgICBpZiAoc2hhcGUudHlwZSgpICE9IENTU0Jhc2ljU2hhcGVFbGxp cHNlVHlwZSkKKyAgICBpZiAoIWlzPENTU0Jhc2ljU2hhcGVFbGxpcHNlPihzaGFwZSkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAotICAgIGNvbnN0IENTU0Jhc2ljU2hhcGVFbGxpcHNlJiBvdGhl ciA9IHRvQ1NTQmFzaWNTaGFwZUVsbGlwc2Uoc2hhcGUpOworICAgIGNvbnN0IENTU0Jhc2ljU2hh cGVFbGxpcHNlJiBvdGhlciA9IGRvd25jYXN0PENTU0Jhc2ljU2hhcGVFbGxpcHNlPihzaGFwZSk7 CiAgICAgcmV0dXJuIGNvbXBhcmVDU1NWYWx1ZVB0cihtX2NlbnRlclgsIG90aGVyLm1fY2VudGVy WCkKICAgICAgICAgJiYgY29tcGFyZUNTU1ZhbHVlUHRyKG1fY2VudGVyWSwgb3RoZXIubV9jZW50 ZXJZKQogICAgICAgICAmJiBjb21wYXJlQ1NTVmFsdWVQdHIobV9yYWRpdXNYLCBvdGhlci5tX3Jh ZGl1c1gpCkBAIC0yNjksMTAgKzI2OSwxMCBAQCBTdHJpbmcgQ1NTQmFzaWNTaGFwZVBvbHlnb246 OmNzc1RleHQoKSBjb25zdAogCiBib29sIENTU0Jhc2ljU2hhcGVQb2x5Z29uOjplcXVhbHMoY29u c3QgQ1NTQmFzaWNTaGFwZSYgc2hhcGUpIGNvbnN0CiB7Ci0gICAgaWYgKHNoYXBlLnR5cGUoKSAh PSBDU1NCYXNpY1NoYXBlUG9seWdvblR5cGUpCisgICAgaWYgKCFpczxDU1NCYXNpY1NoYXBlUG9s eWdvbj4oc2hhcGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBjb25zdCBDU1NCYXNp Y1NoYXBlUG9seWdvbiYgcmhzID0gdG9DU1NCYXNpY1NoYXBlUG9seWdvbihzaGFwZSk7CisgICAg Y29uc3QgQ1NTQmFzaWNTaGFwZVBvbHlnb24mIHJocyA9IGRvd25jYXN0PENTU0Jhc2ljU2hhcGVQ b2x5Z29uPihzaGFwZSk7CiAgICAgcmV0dXJuIGNvbXBhcmVDU1NWYWx1ZVB0cihtX3JlZmVyZW5j ZUJveCwgcmhzLm1fcmVmZXJlbmNlQm94KQogICAgICAgICAmJiBjb21wYXJlQ1NTVmFsdWVWZWN0 b3I8Q1NTUHJpbWl0aXZlVmFsdWU+KG1fdmFsdWVzLCByaHMubV92YWx1ZXMpOwogfQpAQCAtNDA0 LDEwICs0MDQsMTAgQEAgU3RyaW5nIENTU0Jhc2ljU2hhcGVJbnNldDo6Y3NzVGV4dCgpIGNvbnN0 CiAKIGJvb2wgQ1NTQmFzaWNTaGFwZUluc2V0OjplcXVhbHMoY29uc3QgQ1NTQmFzaWNTaGFwZSYg c2hhcGUpIGNvbnN0CiB7Ci0gICAgaWYgKHNoYXBlLnR5cGUoKSAhPSBDU1NCYXNpY1NoYXBlSW5z ZXRUeXBlKQorICAgIGlmICghaXM8Q1NTQmFzaWNTaGFwZUluc2V0PihzaGFwZSkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgIGNvbnN0IENTU0Jhc2ljU2hhcGVJbnNldCYgb3RoZXIgPSB0 b0NTU0Jhc2ljU2hhcGVJbnNldChzaGFwZSk7CisgICAgY29uc3QgQ1NTQmFzaWNTaGFwZUluc2V0 JiBvdGhlciA9IGRvd25jYXN0PENTU0Jhc2ljU2hhcGVJbnNldD4oc2hhcGUpOwogICAgIHJldHVy biBjb21wYXJlQ1NTVmFsdWVQdHIobV90b3AsIG90aGVyLm1fdG9wKQogICAgICAgICAmJiBjb21w YXJlQ1NTVmFsdWVQdHIobV9yaWdodCwgb3RoZXIubV9yaWdodCkKICAgICAgICAgJiYgY29tcGFy ZUNTU1ZhbHVlUHRyKG1fYm90dG9tLCBvdGhlci5tX2JvdHRvbSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NCYXNpY1NoYXBlcy5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Jh c2ljU2hhcGVzLmgKaW5kZXggMjBhYjI4NDdlNmYwZjllMDdlMjAzMzMwNThjZWVhMjViMmVkZmY0 MS4uZjAxNWRkZmZmYjlhYWY4ZTVjNzdhM2QzMDA5YTdlNDA1M2E1ZWU3MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU0Jhc2ljU2hhcGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0Jhc2ljU2hhcGVzLmgKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJDU1NQcmlt aXRpdmVWYWx1ZS5oIgogI2luY2x1ZGUgIldpbmRSdWxlLmgiCiAjaW5jbHVkZSA8d3RmL1JlZlB0 ci5oPgorI2luY2x1ZGUgPHd0Zi9UeXBlQ2FzdHMuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+ CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKQEAgLTYyLDkgKzYzLDYgQEAgcHJv dGVjdGVkOgogICAgIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gbV9yZWZlcmVuY2VCb3g7CiB9 OwogCi0jZGVmaW5lIENTU19CQVNJQ19TSEFQRVNfVFlQRV9DQVNUUyhUb1ZhbHVlVHlwZU5hbWUs IHByZWRpY2F0ZSkgXAotICAgIFRZUEVfQ0FTVFNfQkFTRShUb1ZhbHVlVHlwZU5hbWUsIENTU0Jh c2ljU2hhcGUsIGJhc2ljU2hhcGUsIGJhc2ljU2hhcGUtPnR5cGUoKSA9PSBwcmVkaWNhdGUsIGJh c2ljU2hhcGUudHlwZSgpID09IHByZWRpY2F0ZSkgCi0KIGNsYXNzIENTU0Jhc2ljU2hhcGVJbnNl dCA6IHB1YmxpYyBDU1NCYXNpY1NoYXBlIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0 cjxDU1NCYXNpY1NoYXBlSW5zZXQ+IGNyZWF0ZSgpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBDU1NC YXNpY1NoYXBlSW5zZXQpOyB9CkBAIC0xMzAsOCArMTI4LDYgQEAgcHJpdmF0ZToKICAgICBSZWZQ dHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1fYm90dG9tTGVmdFJhZGl1czsKIH07CiAKLUNTU19CQVNJ Q19TSEFQRVNfVFlQRV9DQVNUUyhDU1NCYXNpY1NoYXBlSW5zZXQsIENTU0Jhc2ljU2hhcGU6OkNT U0Jhc2ljU2hhcGVJbnNldFR5cGUpCi0KIGNsYXNzIENTU0Jhc2ljU2hhcGVDaXJjbGUgOiBwdWJs aWMgQ1NTQmFzaWNTaGFwZSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTQmFz aWNTaGFwZUNpcmNsZT4gY3JlYXRlKCkgeyByZXR1cm4gYWRvcHRSZWYobmV3IENTU0Jhc2ljU2hh cGVDaXJjbGUpOyB9CkBAIC0xNTYsOCArMTUyLDYgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8Q1NT UHJpbWl0aXZlVmFsdWU+IG1fcmFkaXVzOwogfTsKIAotQ1NTX0JBU0lDX1NIQVBFU19UWVBFX0NB U1RTKENTU0Jhc2ljU2hhcGVDaXJjbGUsIENTU0Jhc2ljU2hhcGU6OkNTU0Jhc2ljU2hhcGVDaXJj bGVUeXBlKQotCiBjbGFzcyBDU1NCYXNpY1NoYXBlRWxsaXBzZSA6IHB1YmxpYyBDU1NCYXNpY1No YXBlIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxDU1NCYXNpY1NoYXBlRWxsaXBz ZT4gY3JlYXRlKCkgeyByZXR1cm4gYWRvcHRSZWYobmV3IENTU0Jhc2ljU2hhcGVFbGxpcHNlKTsg fQpAQCAtMTg1LDggKzE3OSw2IEBAIHByaXZhdGU6CiAgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZh bHVlPiBtX3JhZGl1c1k7CiB9OwogCi1DU1NfQkFTSUNfU0hBUEVTX1RZUEVfQ0FTVFMoQ1NTQmFz aWNTaGFwZUVsbGlwc2UsIENTU0Jhc2ljU2hhcGU6OkNTU0Jhc2ljU2hhcGVFbGxpcHNlVHlwZSkK LQogY2xhc3MgQ1NTQmFzaWNTaGFwZVBvbHlnb24gOiBwdWJsaWMgQ1NTQmFzaWNTaGFwZSB7CiBw dWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTQmFzaWNTaGFwZVBvbHlnb24+IGNyZWF0 ZSgpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBDU1NCYXNpY1NoYXBlUG9seWdvbik7IH0KQEAgLTIx OCw4ICsyMTAsMTYgQEAgcHJpdmF0ZToKICAgICBXaW5kUnVsZSBtX3dpbmRSdWxlOwogfTsKIAot Q1NTX0JBU0lDX1NIQVBFU19UWVBFX0NBU1RTKENTU0Jhc2ljU2hhcGVQb2x5Z29uLCBDU1NCYXNp Y1NoYXBlOjpDU1NCYXNpY1NoYXBlUG9seWdvblR5cGUpCi0KIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKIAorI2RlZmluZSBTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0NTU19CQVNJQ19TSEFQRVMoVG9W YWx1ZVR5cGVOYW1lKSBcCitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0JFR0lOKFdlYkNvcmU6OlRv VmFsdWVUeXBlTmFtZSkgXAorICAgIHN0YXRpYyBib29sIGlzVHlwZShjb25zdCBXZWJDb3JlOjpD U1NCYXNpY1NoYXBlJiBiYXNpY1NoYXBlKSB7IHJldHVybiBiYXNpY1NoYXBlLnR5cGUoKSA9PSBX ZWJDb3JlOjpDU1NCYXNpY1NoYXBlOjpUb1ZhbHVlVHlwZU5hbWUjI1R5cGU7IH0gXAorU1BFQ0lB TElaRV9UWVBFX1RSQUlUU19FTkQoKQorCitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0NTU19CQVNJ Q19TSEFQRVMoQ1NTQmFzaWNTaGFwZUluc2V0KQorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19DU1Nf QkFTSUNfU0hBUEVTKENTU0Jhc2ljU2hhcGVDaXJjbGUpCitTUEVDSUFMSVpFX1RZUEVfVFJBSVRT X0NTU19CQVNJQ19TSEFQRVMoQ1NTQmFzaWNTaGFwZUVsbGlwc2UpCitTUEVDSUFMSVpFX1RZUEVf VFJBSVRTX0NTU19CQVNJQ19TSEFQRVMoQ1NTQmFzaWNTaGFwZVBvbHlnb24pCisKICNlbmRpZiAv LyBDU1NCYXNpY1NoYXBlc19oCg== 239144 2014-10-02 14:58:31 -0700 2014-10-02 15:53:22 -0700 Patch bug-137331-20141002145832.patch text/plain 11614 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTdkYzYwMGU1OWRmMzA2 YjVkZTViZTBkZjYyOGIzZTk0Mzk4YmVkNS4uZDkwNGE2ODIxYzgzMDFiMjRhMGEwYTAwNTExZGE1 ZDFkY2VlMDQwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE0LTEwLTAxICBDaHJp c3RvcGhlIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAorICAgICAgICBVc2UgaXM8PigpIC8g ZG93bmNhc3Q8PigpIGZvciBDU1NCYXNpY1NoYXBlIG9iamVjdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzMzMQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBpczw+KCkgLyBkb3duY2FzdDw+KCkg Zm9yIENTU0Jhc2ljU2hhcGUgb2JqZWN0cy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJl aGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGNzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmJhc2ljU2hhcGVGb3JWYWx1ZSk6CisgICAgICAgICogY3NzL0NT U0Jhc2ljU2hhcGVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0Jhc2ljU2hhcGVDaXJjbGU6 OmVxdWFscyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NCYXNpY1NoYXBlRWxsaXBzZTo6ZXF1YWxz KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0Jhc2ljU2hhcGVQb2x5Z29uOjplcXVhbHMpOgorICAg ICAgICAoV2ViQ29yZTo6Q1NTQmFzaWNTaGFwZUluc2V0OjplcXVhbHMpOgorICAgICAgICAqIGNz cy9DU1NCYXNpY1NoYXBlcy5oOgorCisyMDE0LTEwLTAxICBDaHJpc3RvcGhlIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KKwogICAgICAgICBIYXZlIGlzPD4oVCopIGZ1bmN0aW9uIGRvIGEgbnVs bCBjaGVjayBvbiB0aGUgcG9pbnRlciBhcmd1bWVudAogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3MzMzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9CYXNp Y1NoYXBlRnVuY3Rpb25zLmNwcAppbmRleCAwNGViYWZlODA1ZTFkZjY1N2I3Y2E0MzAzYTdjMjEy MDI4MTEzNjE2Li40ZmNmNGNlZmIyYjkyNmE2ZmQ1NWJkYjhhNzMwNDk4ZjAyMzVjYWQwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwCkBAIC0yMDUsMzUgKzIw NSwzNSBAQCBQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJhc2ljU2hhcGVGb3JWYWx1ZShjb25zdCBD U1NUb0xlbmd0aENvbnZlcnNpb25EYXRhJiBjb252ZQogCiAgICAgc3dpdGNoIChiYXNpY1NoYXBl VmFsdWUtPnR5cGUoKSkgewogICAgIGNhc2UgQ1NTQmFzaWNTaGFwZTo6Q1NTQmFzaWNTaGFwZUNp cmNsZVR5cGU6IHsKLSAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZUNpcmNsZSogY2lyY2xlVmFs dWUgPSB0b0NTU0Jhc2ljU2hhcGVDaXJjbGUoYmFzaWNTaGFwZVZhbHVlKTsKKyAgICAgICAgY29u c3QgQ1NTQmFzaWNTaGFwZUNpcmNsZSYgY2lyY2xlVmFsdWUgPSBkb3duY2FzdDxDU1NCYXNpY1No YXBlQ2lyY2xlPigqYmFzaWNTaGFwZVZhbHVlKTsKICAgICAgICAgUmVmUHRyPEJhc2ljU2hhcGVD aXJjbGU+IGNpcmNsZSA9IEJhc2ljU2hhcGVDaXJjbGU6OmNyZWF0ZSgpOwogCi0gICAgICAgIGNp cmNsZS0+c2V0Q2VudGVyWChjb252ZXJ0VG9DZW50ZXJDb29yZGluYXRlKGNvbnZlcnNpb25EYXRh LCBjaXJjbGVWYWx1ZS0+Y2VudGVyWCgpKSk7Ci0gICAgICAgIGNpcmNsZS0+c2V0Q2VudGVyWShj b252ZXJ0VG9DZW50ZXJDb29yZGluYXRlKGNvbnZlcnNpb25EYXRhLCBjaXJjbGVWYWx1ZS0+Y2Vu dGVyWSgpKSk7Ci0gICAgICAgIGNpcmNsZS0+c2V0UmFkaXVzKGNzc1ZhbHVlVG9CYXNpY1NoYXBl UmFkaXVzKGNvbnZlcnNpb25EYXRhLCBjaXJjbGVWYWx1ZS0+cmFkaXVzKCkpKTsKKyAgICAgICAg Y2lyY2xlLT5zZXRDZW50ZXJYKGNvbnZlcnRUb0NlbnRlckNvb3JkaW5hdGUoY29udmVyc2lvbkRh dGEsIGNpcmNsZVZhbHVlLmNlbnRlclgoKSkpOworICAgICAgICBjaXJjbGUtPnNldENlbnRlclko Y29udmVydFRvQ2VudGVyQ29vcmRpbmF0ZShjb252ZXJzaW9uRGF0YSwgY2lyY2xlVmFsdWUuY2Vu dGVyWSgpKSk7CisgICAgICAgIGNpcmNsZS0+c2V0UmFkaXVzKGNzc1ZhbHVlVG9CYXNpY1NoYXBl UmFkaXVzKGNvbnZlcnNpb25EYXRhLCBjaXJjbGVWYWx1ZS5yYWRpdXMoKSkpOwogCiAgICAgICAg IGJhc2ljU2hhcGUgPSBjaXJjbGUucmVsZWFzZSgpOwogICAgICAgICBicmVhazsKICAgICB9CiAg ICAgY2FzZSBDU1NCYXNpY1NoYXBlOjpDU1NCYXNpY1NoYXBlRWxsaXBzZVR5cGU6IHsKLSAgICAg ICAgY29uc3QgQ1NTQmFzaWNTaGFwZUVsbGlwc2UqIGVsbGlwc2VWYWx1ZSA9IHRvQ1NTQmFzaWNT aGFwZUVsbGlwc2UoYmFzaWNTaGFwZVZhbHVlKTsKKyAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFw ZUVsbGlwc2UmIGVsbGlwc2VWYWx1ZSA9IGRvd25jYXN0PENTU0Jhc2ljU2hhcGVFbGxpcHNlPigq YmFzaWNTaGFwZVZhbHVlKTsKICAgICAgICAgUmVmUHRyPEJhc2ljU2hhcGVFbGxpcHNlPiBlbGxp cHNlID0gQmFzaWNTaGFwZUVsbGlwc2U6OmNyZWF0ZSgpOwogCi0gICAgICAgIGVsbGlwc2UtPnNl dENlbnRlclgoY29udmVydFRvQ2VudGVyQ29vcmRpbmF0ZShjb252ZXJzaW9uRGF0YSwgZWxsaXBz ZVZhbHVlLT5jZW50ZXJYKCkpKTsKLSAgICAgICAgZWxsaXBzZS0+c2V0Q2VudGVyWShjb252ZXJ0 VG9DZW50ZXJDb29yZGluYXRlKGNvbnZlcnNpb25EYXRhLCBlbGxpcHNlVmFsdWUtPmNlbnRlclko KSkpOworICAgICAgICBlbGxpcHNlLT5zZXRDZW50ZXJYKGNvbnZlcnRUb0NlbnRlckNvb3JkaW5h dGUoY29udmVyc2lvbkRhdGEsIGVsbGlwc2VWYWx1ZS5jZW50ZXJYKCkpKTsKKyAgICAgICAgZWxs aXBzZS0+c2V0Q2VudGVyWShjb252ZXJ0VG9DZW50ZXJDb29yZGluYXRlKGNvbnZlcnNpb25EYXRh LCBlbGxpcHNlVmFsdWUuY2VudGVyWSgpKSk7CiAKLSAgICAgICAgZWxsaXBzZS0+c2V0UmFkaXVz WChjc3NWYWx1ZVRvQmFzaWNTaGFwZVJhZGl1cyhjb252ZXJzaW9uRGF0YSwgZWxsaXBzZVZhbHVl LT5yYWRpdXNYKCkpKTsKLSAgICAgICAgZWxsaXBzZS0+c2V0UmFkaXVzWShjc3NWYWx1ZVRvQmFz aWNTaGFwZVJhZGl1cyhjb252ZXJzaW9uRGF0YSwgZWxsaXBzZVZhbHVlLT5yYWRpdXNZKCkpKTsK KyAgICAgICAgZWxsaXBzZS0+c2V0UmFkaXVzWChjc3NWYWx1ZVRvQmFzaWNTaGFwZVJhZGl1cyhj b252ZXJzaW9uRGF0YSwgZWxsaXBzZVZhbHVlLnJhZGl1c1goKSkpOworICAgICAgICBlbGxpcHNl LT5zZXRSYWRpdXNZKGNzc1ZhbHVlVG9CYXNpY1NoYXBlUmFkaXVzKGNvbnZlcnNpb25EYXRhLCBl bGxpcHNlVmFsdWUucmFkaXVzWSgpKSk7CiAKICAgICAgICAgYmFzaWNTaGFwZSA9IGVsbGlwc2Uu cmVsZWFzZSgpOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgY2FzZSBDU1NCYXNpY1NoYXBl OjpDU1NCYXNpY1NoYXBlUG9seWdvblR5cGU6IHsKLSAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFw ZVBvbHlnb24qIHBvbHlnb25WYWx1ZSA9IHRvQ1NTQmFzaWNTaGFwZVBvbHlnb24oYmFzaWNTaGFw ZVZhbHVlKTsKKyAgICAgICAgY29uc3QgQ1NTQmFzaWNTaGFwZVBvbHlnb24mIHBvbHlnb25WYWx1 ZSA9IGRvd25jYXN0PENTU0Jhc2ljU2hhcGVQb2x5Z29uPigqYmFzaWNTaGFwZVZhbHVlKTsKICAg ICAgICAgUmVmUHRyPEJhc2ljU2hhcGVQb2x5Z29uPiBwb2x5Z29uID0gQmFzaWNTaGFwZVBvbHln b246OmNyZWF0ZSgpOwogCi0gICAgICAgIHBvbHlnb24tPnNldFdpbmRSdWxlKHBvbHlnb25WYWx1 ZS0+d2luZFJ1bGUoKSk7Ci0gICAgICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8Q1NTUHJpbWl0aXZl VmFsdWU+PiYgdmFsdWVzID0gcG9seWdvblZhbHVlLT52YWx1ZXMoKTsKKyAgICAgICAgcG9seWdv bi0+c2V0V2luZFJ1bGUocG9seWdvblZhbHVlLndpbmRSdWxlKCkpOworICAgICAgICBjb25zdCBW ZWN0b3I8UmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPj4mIHZhbHVlcyA9IHBvbHlnb25WYWx1ZS52 YWx1ZXMoKTsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHZhbHVlcy5zaXplKCk7 IGkgKz0gMikKICAgICAgICAgICAgIHBvbHlnb24tPmFwcGVuZFBvaW50KGNvbnZlcnRUb0xlbmd0 aChjb252ZXJzaW9uRGF0YSwgdmFsdWVzLmF0KGkpLmdldCgpKSwgY29udmVydFRvTGVuZ3RoKGNv bnZlcnNpb25EYXRhLCB2YWx1ZXMuYXQoaSArIDEpLmdldCgpKSk7CiAKQEAgLTI0MSwxOCArMjQx LDE4IEBAIFBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gYmFzaWNTaGFwZUZvclZhbHVlKGNvbnN0IENT U1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmIGNvbnZlCiAgICAgICAgIGJyZWFrOwogICAgIH0KICAg ICBjYXNlIENTU0Jhc2ljU2hhcGU6OkNTU0Jhc2ljU2hhcGVJbnNldFR5cGU6IHsKLSAgICAgICAg Y29uc3QgQ1NTQmFzaWNTaGFwZUluc2V0KiByZWN0VmFsdWUgPSB0b0NTU0Jhc2ljU2hhcGVJbnNl dChiYXNpY1NoYXBlVmFsdWUpOworICAgICAgICBjb25zdCBDU1NCYXNpY1NoYXBlSW5zZXQmIHJl Y3RWYWx1ZSA9IGRvd25jYXN0PENTU0Jhc2ljU2hhcGVJbnNldD4oKmJhc2ljU2hhcGVWYWx1ZSk7 CiAgICAgICAgIFJlZlB0cjxCYXNpY1NoYXBlSW5zZXQ+IHJlY3QgPSBCYXNpY1NoYXBlSW5zZXQ6 OmNyZWF0ZSgpOwogCi0gICAgICAgIHJlY3QtPnNldFRvcChjb252ZXJ0VG9MZW5ndGgoY29udmVy c2lvbkRhdGEsIHJlY3RWYWx1ZS0+dG9wKCkpKTsKLSAgICAgICAgcmVjdC0+c2V0UmlnaHQoY29u dmVydFRvTGVuZ3RoKGNvbnZlcnNpb25EYXRhLCByZWN0VmFsdWUtPnJpZ2h0KCkpKTsKLSAgICAg ICAgcmVjdC0+c2V0Qm90dG9tKGNvbnZlcnRUb0xlbmd0aChjb252ZXJzaW9uRGF0YSwgcmVjdFZh bHVlLT5ib3R0b20oKSkpOwotICAgICAgICByZWN0LT5zZXRMZWZ0KGNvbnZlcnRUb0xlbmd0aChj b252ZXJzaW9uRGF0YSwgcmVjdFZhbHVlLT5sZWZ0KCkpKTsKKyAgICAgICAgcmVjdC0+c2V0VG9w KGNvbnZlcnRUb0xlbmd0aChjb252ZXJzaW9uRGF0YSwgcmVjdFZhbHVlLnRvcCgpKSk7CisgICAg ICAgIHJlY3QtPnNldFJpZ2h0KGNvbnZlcnRUb0xlbmd0aChjb252ZXJzaW9uRGF0YSwgcmVjdFZh bHVlLnJpZ2h0KCkpKTsKKyAgICAgICAgcmVjdC0+c2V0Qm90dG9tKGNvbnZlcnRUb0xlbmd0aChj b252ZXJzaW9uRGF0YSwgcmVjdFZhbHVlLmJvdHRvbSgpKSk7CisgICAgICAgIHJlY3QtPnNldExl ZnQoY29udmVydFRvTGVuZ3RoKGNvbnZlcnNpb25EYXRhLCByZWN0VmFsdWUubGVmdCgpKSk7CiAK LSAgICAgICAgcmVjdC0+c2V0VG9wTGVmdFJhZGl1cyhjb252ZXJ0VG9MZW5ndGhTaXplKGNvbnZl cnNpb25EYXRhLCByZWN0VmFsdWUtPnRvcExlZnRSYWRpdXMoKSkpOwotICAgICAgICByZWN0LT5z ZXRUb3BSaWdodFJhZGl1cyhjb252ZXJ0VG9MZW5ndGhTaXplKGNvbnZlcnNpb25EYXRhLCByZWN0 VmFsdWUtPnRvcFJpZ2h0UmFkaXVzKCkpKTsKLSAgICAgICAgcmVjdC0+c2V0Qm90dG9tUmlnaHRS YWRpdXMoY29udmVydFRvTGVuZ3RoU2l6ZShjb252ZXJzaW9uRGF0YSwgcmVjdFZhbHVlLT5ib3R0 b21SaWdodFJhZGl1cygpKSk7Ci0gICAgICAgIHJlY3QtPnNldEJvdHRvbUxlZnRSYWRpdXMoY29u dmVydFRvTGVuZ3RoU2l6ZShjb252ZXJzaW9uRGF0YSwgcmVjdFZhbHVlLT5ib3R0b21MZWZ0UmFk aXVzKCkpKTsKKyAgICAgICAgcmVjdC0+c2V0VG9wTGVmdFJhZGl1cyhjb252ZXJ0VG9MZW5ndGhT aXplKGNvbnZlcnNpb25EYXRhLCByZWN0VmFsdWUudG9wTGVmdFJhZGl1cygpKSk7CisgICAgICAg IHJlY3QtPnNldFRvcFJpZ2h0UmFkaXVzKGNvbnZlcnRUb0xlbmd0aFNpemUoY29udmVyc2lvbkRh dGEsIHJlY3RWYWx1ZS50b3BSaWdodFJhZGl1cygpKSk7CisgICAgICAgIHJlY3QtPnNldEJvdHRv bVJpZ2h0UmFkaXVzKGNvbnZlcnRUb0xlbmd0aFNpemUoY29udmVyc2lvbkRhdGEsIHJlY3RWYWx1 ZS5ib3R0b21SaWdodFJhZGl1cygpKSk7CisgICAgICAgIHJlY3QtPnNldEJvdHRvbUxlZnRSYWRp dXMoY29udmVydFRvTGVuZ3RoU2l6ZShjb252ZXJzaW9uRGF0YSwgcmVjdFZhbHVlLmJvdHRvbUxl ZnRSYWRpdXMoKSkpOwogCiAgICAgICAgIGJhc2ljU2hhcGUgPSByZWN0LnJlbGVhc2UoKTsKICAg ICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQmFzaWNTaGFw ZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Jhc2ljU2hhcGVzLmNwcAppbmRleCA2MTVj MGY1ZDFiM2VkZjU0YjUxZWIxOTJlN2VmMjA4MjI3ODI0ODJkLi5hNDY4Mzg2YWRhODM3ZTU0MGYz YzM5OTM1MTNlMWI5NDk2ZWJhNWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT QmFzaWNTaGFwZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCYXNpY1NoYXBlcy5j cHAKQEAgLTEyNSwxMCArMTI1LDEwIEBAIFN0cmluZyBDU1NCYXNpY1NoYXBlQ2lyY2xlOjpjc3NU ZXh0KCkgY29uc3QKIAogYm9vbCBDU1NCYXNpY1NoYXBlQ2lyY2xlOjplcXVhbHMoY29uc3QgQ1NT QmFzaWNTaGFwZSYgc2hhcGUpIGNvbnN0CiB7Ci0gICAgaWYgKHNoYXBlLnR5cGUoKSAhPSBDU1NC YXNpY1NoYXBlQ2lyY2xlVHlwZSkKKyAgICBpZiAoIWlzPENTU0Jhc2ljU2hhcGVDaXJjbGU+KHNo YXBlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgY29uc3QgQ1NTQmFzaWNTaGFwZUNp cmNsZSYgb3RoZXIgPSB0b0NTU0Jhc2ljU2hhcGVDaXJjbGUoc2hhcGUpOworICAgIGNvbnN0IENT U0Jhc2ljU2hhcGVDaXJjbGUmIG90aGVyID0gZG93bmNhc3Q8Q1NTQmFzaWNTaGFwZUNpcmNsZT4o c2hhcGUpOwogICAgIHJldHVybiBjb21wYXJlQ1NTVmFsdWVQdHIobV9jZW50ZXJYLCBvdGhlci5t X2NlbnRlclgpCiAgICAgICAgICYmIGNvbXBhcmVDU1NWYWx1ZVB0cihtX2NlbnRlclksIG90aGVy Lm1fY2VudGVyWSkKICAgICAgICAgJiYgY29tcGFyZUNTU1ZhbHVlUHRyKG1fcmFkaXVzLCBvdGhl ci5tX3JhZGl1cykKQEAgLTE5OCwxMCArMTk4LDEwIEBAIFN0cmluZyBDU1NCYXNpY1NoYXBlRWxs aXBzZTo6Y3NzVGV4dCgpIGNvbnN0CiAKIGJvb2wgQ1NTQmFzaWNTaGFwZUVsbGlwc2U6OmVxdWFs cyhjb25zdCBDU1NCYXNpY1NoYXBlJiBzaGFwZSkgY29uc3QKIHsKLSAgICBpZiAoc2hhcGUudHlw ZSgpICE9IENTU0Jhc2ljU2hhcGVFbGxpcHNlVHlwZSkKKyAgICBpZiAoIWlzPENTU0Jhc2ljU2hh cGVFbGxpcHNlPihzaGFwZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGNvbnN0IENT U0Jhc2ljU2hhcGVFbGxpcHNlJiBvdGhlciA9IHRvQ1NTQmFzaWNTaGFwZUVsbGlwc2Uoc2hhcGUp OworICAgIGNvbnN0IENTU0Jhc2ljU2hhcGVFbGxpcHNlJiBvdGhlciA9IGRvd25jYXN0PENTU0Jh c2ljU2hhcGVFbGxpcHNlPihzaGFwZSk7CiAgICAgcmV0dXJuIGNvbXBhcmVDU1NWYWx1ZVB0ciht X2NlbnRlclgsIG90aGVyLm1fY2VudGVyWCkKICAgICAgICAgJiYgY29tcGFyZUNTU1ZhbHVlUHRy KG1fY2VudGVyWSwgb3RoZXIubV9jZW50ZXJZKQogICAgICAgICAmJiBjb21wYXJlQ1NTVmFsdWVQ dHIobV9yYWRpdXNYLCBvdGhlci5tX3JhZGl1c1gpCkBAIC0yNjksMTAgKzI2OSwxMCBAQCBTdHJp bmcgQ1NTQmFzaWNTaGFwZVBvbHlnb246OmNzc1RleHQoKSBjb25zdAogCiBib29sIENTU0Jhc2lj U2hhcGVQb2x5Z29uOjplcXVhbHMoY29uc3QgQ1NTQmFzaWNTaGFwZSYgc2hhcGUpIGNvbnN0CiB7 Ci0gICAgaWYgKHNoYXBlLnR5cGUoKSAhPSBDU1NCYXNpY1NoYXBlUG9seWdvblR5cGUpCisgICAg aWYgKCFpczxDU1NCYXNpY1NoYXBlUG9seWdvbj4oc2hhcGUpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBjb25zdCBDU1NCYXNpY1NoYXBlUG9seWdvbiYgcmhzID0gdG9DU1NCYXNpY1No YXBlUG9seWdvbihzaGFwZSk7CisgICAgY29uc3QgQ1NTQmFzaWNTaGFwZVBvbHlnb24mIHJocyA9 IGRvd25jYXN0PENTU0Jhc2ljU2hhcGVQb2x5Z29uPihzaGFwZSk7CiAgICAgcmV0dXJuIGNvbXBh cmVDU1NWYWx1ZVB0cihtX3JlZmVyZW5jZUJveCwgcmhzLm1fcmVmZXJlbmNlQm94KQogICAgICAg ICAmJiBjb21wYXJlQ1NTVmFsdWVWZWN0b3I8Q1NTUHJpbWl0aXZlVmFsdWU+KG1fdmFsdWVzLCBy aHMubV92YWx1ZXMpOwogfQpAQCAtNDA0LDEwICs0MDQsMTAgQEAgU3RyaW5nIENTU0Jhc2ljU2hh cGVJbnNldDo6Y3NzVGV4dCgpIGNvbnN0CiAKIGJvb2wgQ1NTQmFzaWNTaGFwZUluc2V0OjplcXVh bHMoY29uc3QgQ1NTQmFzaWNTaGFwZSYgc2hhcGUpIGNvbnN0CiB7Ci0gICAgaWYgKHNoYXBlLnR5 cGUoKSAhPSBDU1NCYXNpY1NoYXBlSW5zZXRUeXBlKQorICAgIGlmICghaXM8Q1NTQmFzaWNTaGFw ZUluc2V0PihzaGFwZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGNvbnN0IENTU0Jh c2ljU2hhcGVJbnNldCYgb3RoZXIgPSB0b0NTU0Jhc2ljU2hhcGVJbnNldChzaGFwZSk7CisgICAg Y29uc3QgQ1NTQmFzaWNTaGFwZUluc2V0JiBvdGhlciA9IGRvd25jYXN0PENTU0Jhc2ljU2hhcGVJ bnNldD4oc2hhcGUpOwogICAgIHJldHVybiBjb21wYXJlQ1NTVmFsdWVQdHIobV90b3AsIG90aGVy Lm1fdG9wKQogICAgICAgICAmJiBjb21wYXJlQ1NTVmFsdWVQdHIobV9yaWdodCwgb3RoZXIubV9y aWdodCkKICAgICAgICAgJiYgY29tcGFyZUNTU1ZhbHVlUHRyKG1fYm90dG9tLCBvdGhlci5tX2Jv dHRvbSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCYXNpY1NoYXBlcy5oIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU0Jhc2ljU2hhcGVzLmgKaW5kZXggMjBhYjI4NDdlNmYwZjll MDdlMjAzMzMwNThjZWVhMjViMmVkZmY0MS4uZjAxNWRkZmZmYjlhYWY4ZTVjNzdhM2QzMDA5YTdl NDA1M2E1ZWU3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Jhc2ljU2hhcGVz LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Jhc2ljU2hhcGVzLmgKQEAgLTMzLDYgKzMz LDcgQEAKICNpbmNsdWRlICJDU1NQcmltaXRpdmVWYWx1ZS5oIgogI2luY2x1ZGUgIldpbmRSdWxl LmgiCiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9UeXBlQ2FzdHMuaD4K ICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+ CiAKQEAgLTYyLDkgKzYzLDYgQEAgcHJvdGVjdGVkOgogICAgIFJlZlB0cjxDU1NQcmltaXRpdmVW YWx1ZT4gbV9yZWZlcmVuY2VCb3g7CiB9OwogCi0jZGVmaW5lIENTU19CQVNJQ19TSEFQRVNfVFlQ RV9DQVNUUyhUb1ZhbHVlVHlwZU5hbWUsIHByZWRpY2F0ZSkgXAotICAgIFRZUEVfQ0FTVFNfQkFT RShUb1ZhbHVlVHlwZU5hbWUsIENTU0Jhc2ljU2hhcGUsIGJhc2ljU2hhcGUsIGJhc2ljU2hhcGUt PnR5cGUoKSA9PSBwcmVkaWNhdGUsIGJhc2ljU2hhcGUudHlwZSgpID09IHByZWRpY2F0ZSkgCi0K IGNsYXNzIENTU0Jhc2ljU2hhcGVJbnNldCA6IHB1YmxpYyBDU1NCYXNpY1NoYXBlIHsKIHB1Ymxp YzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxDU1NCYXNpY1NoYXBlSW5zZXQ+IGNyZWF0ZSgpIHsg cmV0dXJuIGFkb3B0UmVmKG5ldyBDU1NCYXNpY1NoYXBlSW5zZXQpOyB9CkBAIC0xMzAsOCArMTI4 LDYgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1fYm90dG9tTGVm dFJhZGl1czsKIH07CiAKLUNTU19CQVNJQ19TSEFQRVNfVFlQRV9DQVNUUyhDU1NCYXNpY1NoYXBl SW5zZXQsIENTU0Jhc2ljU2hhcGU6OkNTU0Jhc2ljU2hhcGVJbnNldFR5cGUpCi0KIGNsYXNzIENT U0Jhc2ljU2hhcGVDaXJjbGUgOiBwdWJsaWMgQ1NTQmFzaWNTaGFwZSB7CiBwdWJsaWM6CiAgICAg c3RhdGljIFBhc3NSZWZQdHI8Q1NTQmFzaWNTaGFwZUNpcmNsZT4gY3JlYXRlKCkgeyByZXR1cm4g YWRvcHRSZWYobmV3IENTU0Jhc2ljU2hhcGVDaXJjbGUpOyB9CkBAIC0xNTYsOCArMTUyLDYgQEAg cHJpdmF0ZToKICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1fcmFkaXVzOwogfTsKIAot Q1NTX0JBU0lDX1NIQVBFU19UWVBFX0NBU1RTKENTU0Jhc2ljU2hhcGVDaXJjbGUsIENTU0Jhc2lj U2hhcGU6OkNTU0Jhc2ljU2hhcGVDaXJjbGVUeXBlKQotCiBjbGFzcyBDU1NCYXNpY1NoYXBlRWxs aXBzZSA6IHB1YmxpYyBDU1NCYXNpY1NoYXBlIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxDU1NCYXNpY1NoYXBlRWxsaXBzZT4gY3JlYXRlKCkgeyByZXR1cm4gYWRvcHRSZWYobmV3 IENTU0Jhc2ljU2hhcGVFbGxpcHNlKTsgfQpAQCAtMTg1LDggKzE3OSw2IEBAIHByaXZhdGU6CiAg ICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBtX3JhZGl1c1k7CiB9OwogCi1DU1NfQkFTSUNf U0hBUEVTX1RZUEVfQ0FTVFMoQ1NTQmFzaWNTaGFwZUVsbGlwc2UsIENTU0Jhc2ljU2hhcGU6OkNT U0Jhc2ljU2hhcGVFbGxpcHNlVHlwZSkKLQogY2xhc3MgQ1NTQmFzaWNTaGFwZVBvbHlnb24gOiBw dWJsaWMgQ1NTQmFzaWNTaGFwZSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q1NT QmFzaWNTaGFwZVBvbHlnb24+IGNyZWF0ZSgpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBDU1NCYXNp Y1NoYXBlUG9seWdvbik7IH0KQEAgLTIxOCw4ICsyMTAsMTYgQEAgcHJpdmF0ZToKICAgICBXaW5k UnVsZSBtX3dpbmRSdWxlOwogfTsKIAotQ1NTX0JBU0lDX1NIQVBFU19UWVBFX0NBU1RTKENTU0Jh c2ljU2hhcGVQb2x5Z29uLCBDU1NCYXNpY1NoYXBlOjpDU1NCYXNpY1NoYXBlUG9seWdvblR5cGUp Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAorI2RlZmluZSBTUEVDSUFMSVpFX1RZUEVfVFJB SVRTX0NTU19CQVNJQ19TSEFQRVMoVG9WYWx1ZVR5cGVOYW1lKSBcCitTUEVDSUFMSVpFX1RZUEVf VFJBSVRTX0JFR0lOKFdlYkNvcmU6OlRvVmFsdWVUeXBlTmFtZSkgXAorICAgIHN0YXRpYyBib29s IGlzVHlwZShjb25zdCBXZWJDb3JlOjpDU1NCYXNpY1NoYXBlJiBiYXNpY1NoYXBlKSB7IHJldHVy biBiYXNpY1NoYXBlLnR5cGUoKSA9PSBXZWJDb3JlOjpDU1NCYXNpY1NoYXBlOjpUb1ZhbHVlVHlw ZU5hbWUjI1R5cGU7IH0gXAorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19FTkQoKQorCitTUEVDSUFM SVpFX1RZUEVfVFJBSVRTX0NTU19CQVNJQ19TSEFQRVMoQ1NTQmFzaWNTaGFwZUluc2V0KQorU1BF Q0lBTElaRV9UWVBFX1RSQUlUU19DU1NfQkFTSUNfU0hBUEVTKENTU0Jhc2ljU2hhcGVDaXJjbGUp CitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0NTU19CQVNJQ19TSEFQRVMoQ1NTQmFzaWNTaGFwZUVs bGlwc2UpCitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0NTU19CQVNJQ19TSEFQRVMoQ1NTQmFzaWNT aGFwZVBvbHlnb24pCisKICNlbmRpZiAvLyBDU1NCYXNpY1NoYXBlc19oCg==