127120 2014-01-16 10:19:52 -0800 [ATK] Modernize the for loops in ATK AX code 2014-01-17 02:57:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs mario samuel_white oldest_to_newest 968809 0 zan 2014-01-16 10:19:52 -0800 [ATK] Modernize the for loops in ATK AX code 968811 1 221389 zan 2014-01-16 10:23:49 -0800 Created attachment 221389 Patch 969095 2 221389 mario 2014-01-17 02:32:23 -0800 Comment on attachment 221389 Patch Lgtm 969098 3 221389 zan 2014-01-17 02:57:46 -0800 Comment on attachment 221389 Patch Clearing flags on attachment: 221389 Committed r162197: <http://trac.webkit.org/changeset/162197> 969099 4 zan 2014-01-17 02:57:52 -0800 All reviewed patches have been landed. Closing bug. 221389 2014-01-16 10:23:49 -0800 2014-01-17 02:57:46 -0800 Patch bug-127120-20140116102348.patch text/plain 10206 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTE0MDMyZjM4YjQxNGQ4 YTk4Njg5NTI0NDZhMDNiNTNiYjY5OWU0ZC4uY2Y1ZWY2YTVlMGE2ZmU2NzE1YTczNDVjZmE1ZjRm MDU3ODYyZDNhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAxLTE2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbQVRLXSBNb2Rlcm5p emUgdGhlIGZvciBsb29wcyBpbiBBVEsgQVggY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3MTIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHRoZSBmb3IgbG9vcHMgdG8gYmUgcmFuZ2Ut YmFzZWQgaW4gQVRLIGFjY2Vzc2liaWxpdHkgY29kZS4KKyAgICAgICAgVGhpcyB3b3JrIGlzIGNv bXBsZW1lbnRhcnkgdG8gcjE2MTk3OS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRrL1dl YktpdEFjY2Vzc2libGVJbnRlcmZhY2VIeXBlcnRleHQuY3BwOgorICAgICAgICAod2Via2l0QWNj ZXNzaWJsZUh5cGVydGV4dEdldExpbmspOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRrL1dl YktpdEFjY2Vzc2libGVJbnRlcmZhY2VUYWJsZS5jcHA6CisgICAgICAgICh3ZWJraXRBY2Nlc3Np YmxlVGFibGVHZXRDb2x1bW5IZWFkZXIpOgorICAgICAgICAod2Via2l0QWNjZXNzaWJsZVRhYmxl R2V0Um93SGVhZGVyKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3Np YmxlVXRpbC5jcHA6CisgICAgICAgIChhY2Nlc3NpYmlsaXR5VGl0bGUpOgorICAgICAgICAoYWNj ZXNzaWJpbGl0eURlc2NyaXB0aW9uKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2F0ay9XZWJL aXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHA6CisgICAgICAgIChnZXROQ2hpbGRyZW5Gb3JUYWJs ZSk6CisgICAgICAgIChnZXRDaGlsZEZvclRhYmxlKToKKyAgICAgICAgKGdldEluZGV4SW5QYXJl bnRGb3JDZWxsSW5Sb3cpOgorCiAyMDE0LTAxLTE1ICBNaWhhaSBUaWNhICA8bWl0aWNhQGFkb2Jl LmNvbT4KIAogICAgICAgICBSZWFwcGx5aW5nOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZUh5cGVydGV4dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJm YWNlSHlwZXJ0ZXh0LmNwcAppbmRleCBiMDY3ODM2YWU2MTdjODJmOGViN2U2YmRlZjI2YjZjNTRl ZmQ5YjQxLi43NWMwNDVjMDE0ZWZmMzRjMTBmYWFkN2M1Njk0MWMwNDY1NzNkMzYyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlSW50 ZXJmYWNlSHlwZXJ0ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0 ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlSHlwZXJ0ZXh0LmNwcApAQCAtNDYsOCArNDYsOCBA QCBzdGF0aWMgQXRrSHlwZXJsaW5rKiB3ZWJraXRBY2Nlc3NpYmxlSHlwZXJ0ZXh0R2V0TGluayhB dGtIeXBlcnRleHQqIGh5cGVydGV4dCwgZwogICAgICAgICByZXR1cm4gMDsKIAogICAgIGdpbnQg Y3VycmVudExpbmsgPSAtMTsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2hpbGRyZW4u c2l6ZSgpOyBpKyspIHsKLSAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogY29yZUNoaWxkID0g Y2hpbGRyZW4uYXQoaSkuZ2V0KCk7CisgICAgZm9yIChjb25zdCBhdXRvJiBjaGlsZCA6IGNoaWxk cmVuKSB7CisgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVDaGlsZCA9IGNoaWxkLmdl dCgpOwogICAgICAgICBpZiAoIWNvcmVDaGlsZC0+YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpKSB7 CiAgICAgICAgICAgICBBdGtPYmplY3QqIGF4T2JqZWN0ID0gY29yZUNoaWxkLT53cmFwcGVyKCk7 CiAgICAgICAgICAgICBpZiAoIWF4T2JqZWN0IHx8ICFBVEtfSVNfSFlQRVJMSU5LX0lNUEwoYXhP YmplY3QpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2Vi S2l0QWNjZXNzaWJsZUludGVyZmFjZVRhYmxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVJbnRlcmZhY2VUYWJsZS5jcHAKaW5kZXggY2I3ZmQ4 OTBhMDYwZmQxMThkNTJlNzA3MzM1Y2E0MTQ4MDVlMzdiZS4uZjZlZDE5YzBhYTY5YWI4MzE1ZDNh MzgxOTJmMTg2ZWEwYTg0NjU2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZVRhYmxlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlVGFibGUu Y3BwCkBAIC0yMDMsMTUgKzIwMywxNCBAQCBzdGF0aWMgQXRrT2JqZWN0KiB3ZWJraXRBY2Nlc3Np YmxlVGFibGVHZXRDb2x1bW5IZWFkZXIoQXRrVGFibGUqIHRhYmxlLCBnaW50IGNvbAogCiAgICAg QWNjZXNzaWJpbGl0eU9iamVjdCogYWNjVGFibGUgPSBjb3JlKHRhYmxlKTsKICAgICBpZiAoYWNj VGFibGUtPmlzQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCgpKSB7Ci0gICAgICAgIEFjY2Vzc2li aWxpdHlPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBhbGxDb2x1bW5IZWFkZXJz OwotICAgICAgICB0b0FjY2Vzc2liaWxpdHlUYWJsZShhY2NUYWJsZSktPmNvbHVtbkhlYWRlcnMo YWxsQ29sdW1uSGVhZGVycyk7Ci0gICAgICAgIHVuc2lnbmVkIGNvbHVtbkNvdW50ID0gYWxsQ29s dW1uSGVhZGVycy5zaXplKCk7Ci0gICAgICAgIGZvciAodW5zaWduZWQgayA9IDA7IGsgPCBjb2x1 bW5Db3VudDsgKytrKSB7CisgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3Q6OkFjY2Vzc2liaWxp dHlDaGlsZHJlblZlY3RvciBjb2x1bW5IZWFkZXJzOworICAgICAgICB0b0FjY2Vzc2liaWxpdHlU YWJsZShhY2NUYWJsZSktPmNvbHVtbkhlYWRlcnMoY29sdW1uSGVhZGVycyk7CisKKyAgICAgICAg Zm9yIChjb25zdCBhdXRvJiBjb2x1bW5IZWFkZXIgOiBjb2x1bW5IZWFkZXJzKSB7CiAgICAgICAg ICAgICBzdGQ6OnBhaXI8dW5zaWduZWQsIHVuc2lnbmVkPiBjb2x1bW5SYW5nZTsKLSAgICAgICAg ICAgIEFjY2Vzc2liaWxpdHlUYWJsZUNlbGwqIGNlbGwgPSB0b0FjY2Vzc2liaWxpdHlUYWJsZUNl bGwoYWxsQ29sdW1uSGVhZGVycy5hdChrKS5nZXQoKSk7Ci0gICAgICAgICAgICBjZWxsLT5jb2x1 bW5JbmRleFJhbmdlKGNvbHVtblJhbmdlKTsKKyAgICAgICAgICAgIHRvQWNjZXNzaWJpbGl0eVRh YmxlQ2VsbChjb2x1bW5IZWFkZXIuZ2V0KCkpLT5jb2x1bW5JbmRleFJhbmdlKGNvbHVtblJhbmdl KTsKICAgICAgICAgICAgIGlmIChjb2x1bW5SYW5nZS5maXJzdCA8PSBzdGF0aWNfY2FzdDx1bnNp Z25lZD4oY29sdW1uKSAmJiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oY29sdW1uKSA8IGNvbHVtblJh bmdlLmZpcnN0ICsgY29sdW1uUmFuZ2Uuc2Vjb25kKQotICAgICAgICAgICAgICAgIHJldHVybiBh bGxDb2x1bW5IZWFkZXJzW2tdLT53cmFwcGVyKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIGNv bHVtbkhlYWRlci0+d3JhcHBlcigpOwogICAgICAgICB9CiAgICAgfQogICAgIHJldHVybiAwOwpA QCAtMjI0LDE1ICsyMjMsMTQgQEAgc3RhdGljIEF0a09iamVjdCogd2Via2l0QWNjZXNzaWJsZVRh YmxlR2V0Um93SGVhZGVyKEF0a1RhYmxlKiB0YWJsZSwgZ2ludCByb3cpCiAKICAgICBBY2Nlc3Np YmlsaXR5T2JqZWN0KiBhY2NUYWJsZSA9IGNvcmUodGFibGUpOwogICAgIGlmIChhY2NUYWJsZS0+ aXNBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KCkpIHsKLSAgICAgICAgQWNjZXNzaWJpbGl0eU9i amVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIGFsbFJvd0hlYWRlcnM7Ci0gICAgICAg IHRvQWNjZXNzaWJpbGl0eVRhYmxlKGFjY1RhYmxlKS0+cm93SGVhZGVycyhhbGxSb3dIZWFkZXJz KTsKLSAgICAgICAgdW5zaWduZWQgcm93Q291bnQgPSBhbGxSb3dIZWFkZXJzLnNpemUoKTsKLSAg ICAgICAgZm9yICh1bnNpZ25lZCBrID0gMDsgayA8IHJvd0NvdW50OyArK2spIHsKKyAgICAgICAg QWNjZXNzaWJpbGl0eU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIHJvd0hlYWRl cnM7CisgICAgICAgIHRvQWNjZXNzaWJpbGl0eVRhYmxlKGFjY1RhYmxlKS0+cm93SGVhZGVycyhy b3dIZWFkZXJzKTsKKworICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIHJvd0hlYWRlciA6IHJvd0hl YWRlcnMpIHsKICAgICAgICAgICAgIHN0ZDo6cGFpcjx1bnNpZ25lZCwgdW5zaWduZWQ+IHJvd1Jh bmdlOwotICAgICAgICAgICAgQWNjZXNzaWJpbGl0eVRhYmxlQ2VsbCogY2VsbCA9IHRvQWNjZXNz aWJpbGl0eVRhYmxlQ2VsbChhbGxSb3dIZWFkZXJzLmF0KGspLmdldCgpKTsKLSAgICAgICAgICAg IGNlbGwtPnJvd0luZGV4UmFuZ2Uocm93UmFuZ2UpOworICAgICAgICAgICAgdG9BY2Nlc3NpYmls aXR5VGFibGVDZWxsKHJvd0hlYWRlci5nZXQoKSktPnJvd0luZGV4UmFuZ2Uocm93UmFuZ2UpOwog ICAgICAgICAgICAgaWYgKHJvd1JhbmdlLmZpcnN0IDw9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihy b3cpICYmIHN0YXRpY19jYXN0PHVuc2lnbmVkPihyb3cpIDwgcm93UmFuZ2UuZmlyc3QgKyByb3dS YW5nZS5zZWNvbmQpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGFsbFJvd0hlYWRlcnNba10tPndy YXBwZXIoKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gcm93SGVhZGVyLT53cmFwcGVyKCk7CiAg ICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlVXRpbC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlVXRpbC5jcHAKaW5kZXggYWI1 MGQ0OTg1MDY3MzliNmY5ZDdkYzAyZmIyNDdiMzc5N2ZlODAxZC4uNTgxNDdmYThjMmIxY2E4ZmYw YzY5YzQwODE5ZGM3NmE0N2NjN2FmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVV0aWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVVdGlsLmNwcApAQCAtOTQsMTAgKzk0 LDcgQEAgU3RyaW5nIGFjY2Vzc2liaWxpdHlUaXRsZShBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3Jl T2JqZWN0KQogICAgIFZlY3RvcjxBY2Nlc3NpYmlsaXR5VGV4dD4gdGV4dE9yZGVyOwogICAgIGNv cmVPYmplY3QtPmFjY2Vzc2liaWxpdHlUZXh0KHRleHRPcmRlcik7CiAKLSAgICB1bnNpZ25lZCBs ZW5ndGggPSB0ZXh0T3JkZXIuc2l6ZSgpOwotICAgIGZvciAodW5zaWduZWQgayA9IDA7IGsgPCBs ZW5ndGg7IGsrKykgewotICAgICAgICBjb25zdCBBY2Nlc3NpYmlsaXR5VGV4dCYgdGV4dCA9IHRl eHRPcmRlcltrXTsKLQorICAgIGZvciAoY29uc3QgQWNjZXNzaWJpbGl0eVRleHQmIHRleHQgOiB0 ZXh0T3JkZXIpIHsKICAgICAgICAgLy8gT25jZSB3ZSBlbmNvdW50ZXIgdmlzaWJsZSB0ZXh0LCBv ciB0aGUgdGV4dCBmcm9tIG91ciBjaGlsZHJlbiB0aGF0IHNob3VsZCBiZSB1c2VkIGZvcmVtb3N0 LgogICAgICAgICBpZiAodGV4dC50ZXh0U291cmNlID09IFZpc2libGVUZXh0IHx8IHRleHQudGV4 dFNvdXJjZSA9PSBDaGlsZHJlblRleHQpCiAgICAgICAgICAgICByZXR1cm4gdGV4dC50ZXh0OwpA QCAtMTE2LDYgKzExMyw3IEBAIFN0cmluZyBhY2Nlc3NpYmlsaXR5VGl0bGUoQWNjZXNzaWJpbGl0 eU9iamVjdCogY29yZU9iamVjdCkKICAgICAgICAgaWYgKHRleHQudGV4dFNvdXJjZSA9PSBUaXRs ZVRhZ1RleHQgJiYgIXRpdGxlVGFnU2hvdWxkQmVVc2VkSW5EZXNjcmlwdGlvbkZpZWxkKGNvcmVP YmplY3QpKQogICAgICAgICAgICAgcmV0dXJuIHRleHQudGV4dDsKICAgICB9CisKICAgICByZXR1 cm4gU3RyaW5nKCk7CiB9CiAKQEAgLTEyNCwxMSArMTIyLDggQEAgU3RyaW5nIGFjY2Vzc2liaWxp dHlEZXNjcmlwdGlvbihBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0KQogICAgIFZlY3Rv cjxBY2Nlc3NpYmlsaXR5VGV4dD4gdGV4dE9yZGVyOwogICAgIGNvcmVPYmplY3QtPmFjY2Vzc2li aWxpdHlUZXh0KHRleHRPcmRlcik7CiAKLSAgICB1bnNpZ25lZCBsZW5ndGggPSB0ZXh0T3JkZXIu c2l6ZSgpOwogICAgIGJvb2wgdmlzaWJsZVRleHRBdmFpbGFibGUgPSBmYWxzZTsKLSAgICBmb3Ig KHVuc2lnbmVkIGsgPSAwOyBrIDwgbGVuZ3RoOyBrKyspIHsKLSAgICAgICAgY29uc3QgQWNjZXNz aWJpbGl0eVRleHQmIHRleHQgPSB0ZXh0T3JkZXJba107Ci0KKyAgICBmb3IgKGNvbnN0IEFjY2Vz c2liaWxpdHlUZXh0JiB0ZXh0IDogdGV4dE9yZGVyKSB7CiAgICAgICAgIGlmICh0ZXh0LnRleHRT b3VyY2UgPT0gQWx0ZXJuYXRpdmVUZXh0KQogICAgICAgICAgICAgcmV0dXJuIHRleHQudGV4dDsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNj ZXNzaWJsZVdyYXBwZXJBdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsv V2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwCmluZGV4IDYwYTliMmE4MGFhZjA3NjBjODUz MzI4YzUyZmEwMjczOTc4YjU2ZmUuLjMwNWUyMzNhZDRhM2ZiYWQ1Y2NjMTEwNDRhYmU5NDdlMWI4 MGQyMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktp dEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKQEAgLTMyMSwxNSArMzIxLDEz IEBAIHN0YXRpYyBBdGtPYmplY3QqIHdlYmtpdEFjY2Vzc2libGVHZXRQYXJlbnQoQXRrT2JqZWN0 KiBvYmplY3QpCiBzdGF0aWMgZ2ludCBnZXROQ2hpbGRyZW5Gb3JUYWJsZShBY2Nlc3NpYmlsaXR5 T2JqZWN0KiBjb3JlT2JqZWN0KQogewogICAgIGNvbnN0IEFjY2Vzc2liaWxpdHlPYmplY3Q6OkFj Y2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgdGFibGVDaGlsZHJlbiA9IGNvcmVPYmplY3QtPmNo aWxkcmVuKCk7Ci0gICAgc2l6ZV90IHRhYmxlQ2hpbGRyZW5Db3VudCA9IHRhYmxlQ2hpbGRyZW4u c2l6ZSgpOwogICAgIHNpemVfdCBjZWxsc0NvdW50ID0gMDsKIAogICAgIC8vIExvb2sgZm9yIHRo ZSBhY3R1YWwgaW5kZXggb2YgdGhlIGNlbGwgaW5zaWRlIHRoZSB0YWJsZS4KLSAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwgdGFibGVDaGlsZHJlbkNvdW50OyArK2kpIHsKLSAgICAgICAgaWYg KHRhYmxlQ2hpbGRyZW5baV0tPmlzVGFibGVSb3coKSkgewotICAgICAgICAgICAgY29uc3QgQWNj ZXNzaWJpbGl0eU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiByb3dDaGlsZHJl biA9IHRhYmxlQ2hpbGRyZW5baV0tPmNoaWxkcmVuKCk7Ci0gICAgICAgICAgICBjZWxsc0NvdW50 ICs9IHJvd0NoaWxkcmVuLnNpemUoKTsKLSAgICAgICAgfSBlbHNlCisgICAgZm9yIChjb25zdCBh dXRvJiB0YWJsZUNoaWxkIDogdGFibGVDaGlsZHJlbikgeworICAgICAgICBpZiAodGFibGVDaGls ZC0+aXNUYWJsZVJvdygpKQorICAgICAgICAgICAgY2VsbHNDb3VudCArPSB0YWJsZUNoaWxkLT5j aGlsZHJlbigpLnNpemUoKTsKKyAgICAgICAgZWxzZQogICAgICAgICAgICAgY2VsbHNDb3VudCsr OwogICAgIH0KIApAQCAtMzU0LDIwICszNTIsMTkgQEAgc3RhdGljIGdpbnQgd2Via2l0QWNjZXNz aWJsZUdldE5DaGlsZHJlbihBdGtPYmplY3QqIG9iamVjdCkKIHN0YXRpYyBBY2Nlc3NpYmlsaXR5 T2JqZWN0KiBnZXRDaGlsZEZvclRhYmxlKEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVPYmplY3Qs IGdpbnQgaW5kZXgpCiB7CiAgICAgY29uc3QgQWNjZXNzaWJpbGl0eU9iamVjdDo6QWNjZXNzaWJp bGl0eUNoaWxkcmVuVmVjdG9yJiB0YWJsZUNoaWxkcmVuID0gY29yZU9iamVjdC0+Y2hpbGRyZW4o KTsKLSAgICBzaXplX3QgdGFibGVDaGlsZHJlbkNvdW50ID0gdGFibGVDaGlsZHJlbi5zaXplKCk7 CiAgICAgc2l6ZV90IGNlbGxzQ291bnQgPSAwOwogCiAgICAgLy8gTG9vayBmb3IgdGhlIGFjdHVh bCBpbmRleCBvZiB0aGUgY2VsbCBpbnNpZGUgdGhlIHRhYmxlLgogICAgIHNpemVfdCBjdXJyZW50 ID0gc3RhdGljX2Nhc3Q8c2l6ZV90PihpbmRleCk7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IHRhYmxlQ2hpbGRyZW5Db3VudDsgKytpKSB7Ci0gICAgICAgIGlmICh0YWJsZUNoaWxkcmVu W2ldLT5pc1RhYmxlUm93KCkpIHsKLSAgICAgICAgICAgIGNvbnN0IEFjY2Vzc2liaWxpdHlPYmpl Y3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgcm93Q2hpbGRyZW4gPSB0YWJsZUNoaWxk cmVuW2ldLT5jaGlsZHJlbigpOworICAgIGZvciAoY29uc3QgYXV0byYgdGFibGVDaGlsZCA6IHRh YmxlQ2hpbGRyZW4pIHsKKyAgICAgICAgaWYgKHRhYmxlQ2hpbGQtPmlzVGFibGVSb3coKSkgewor ICAgICAgICAgICAgY29uc3QgQWNjZXNzaWJpbGl0eU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxk cmVuVmVjdG9yJiByb3dDaGlsZHJlbiA9IHRhYmxlQ2hpbGQtPmNoaWxkcmVuKCk7CiAgICAgICAg ICAgICBzaXplX3Qgcm93Q2hpbGRyZW5Db3VudCA9IHJvd0NoaWxkcmVuLnNpemUoKTsKICAgICAg ICAgICAgIGlmIChjdXJyZW50IDwgY2VsbHNDb3VudCArIHJvd0NoaWxkcmVuQ291bnQpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHJvd0NoaWxkcmVuLmF0KGN1cnJlbnQgLSBjZWxsc0NvdW50KS5n ZXQoKTsKICAgICAgICAgICAgIGNlbGxzQ291bnQgKz0gcm93Q2hpbGRyZW5Db3VudDsKICAgICAg ICAgfSBlbHNlIGlmIChjZWxsc0NvdW50ID09IGN1cnJlbnQpCi0gICAgICAgICAgICByZXR1cm4g dGFibGVDaGlsZHJlbltpXS5nZXQoKTsKKyAgICAgICAgICAgIHJldHVybiB0YWJsZUNoaWxkLmdl dCgpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBjZWxsc0NvdW50Kys7CiAgICAgfQpAQCAt NDE5LDE4ICs0MTYsMTcgQEAgc3RhdGljIGdpbnQgZ2V0SW5kZXhJblBhcmVudEZvckNlbGxJblJv dyhBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0KQogICAgICAgICByZXR1cm4gLTE7CiAK ICAgICBjb25zdCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0 b3ImIHJvd3MgPSBncmFuZFBhcmVudC0+Y2hpbGRyZW4oKTsKLSAgICBzaXplX3Qgcm93c0NvdW50 ID0gcm93cy5zaXplKCk7CiAgICAgc2l6ZV90IHByZXZpb3VzQ2VsbHNDb3VudCA9IDA7CiAKICAg ICAvLyBMb29rIGZvciB0aGUgYWN0dWFsIGluZGV4IG9mIHRoZSBjZWxsIGluc2lkZSB0aGUgdGFi bGUuCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHJvd3NDb3VudDsgKytpKSB7Ci0gICAg ICAgIGlmICghcm93c1tpXS0+aXNUYWJsZVJvdygpKQorICAgIGZvciAoY29uc3QgYXV0byYgcm93 IDogcm93cykgeworICAgICAgICBpZiAoIXJvdy0+aXNUYWJsZVJvdygpKQogICAgICAgICAgICAg Y29udGludWU7CiAKLSAgICAgICAgY29uc3QgQWNjZXNzaWJpbGl0eU9iamVjdDo6QWNjZXNzaWJp bGl0eUNoaWxkcmVuVmVjdG9yJiBjZWxscyA9IHJvd3NbaV0tPmNoaWxkcmVuKCk7CisgICAgICAg IGNvbnN0IEFjY2Vzc2liaWxpdHlPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYg Y2VsbHMgPSByb3ctPmNoaWxkcmVuKCk7CiAgICAgICAgIHNpemVfdCBjZWxsc0NvdW50ID0gY2Vs bHMuc2l6ZSgpOwogCi0gICAgICAgIGlmIChyb3dzW2ldID09IHBhcmVudCkgeworICAgICAgICBp ZiAocm93ID09IHBhcmVudCkgewogICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBqID0gMDsgaiA8 IGNlbGxzQ291bnQ7ICsraikgewogICAgICAgICAgICAgICAgIGlmIChjZWxsc1tqXSA9PSBjb3Jl T2JqZWN0KQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gcHJldmlvdXNDZWxsc0NvdW50ICsg ajsK