29162 2009-09-10 17:09:08 -0700 [Qt] Fix comparison between signed and unsigned integer warnings 2009-09-10 20:12:38 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 0 laszlo.gombos webkit-unassigned oldest_to_newest 146405 0 laszlo.gombos 2009-09-10 17:09:08 -0700 The significance of this work is to make a step towards enforcing the same code quality measures as other WebKit ports (most notably the mac port) so that contributors focusing on a specific WebKit ports are less likely break other ports because of the difference in quality requirements. 146408 1 39396 laszlo.gombos 2009-09-10 17:13:13 -0700 Created attachment 39396 proposed patch 146424 2 39396 eric 2009-09-10 17:54:44 -0700 Comment on attachment 39396 proposed patch LGTM. You can cq+ or land yourself since you're a committer. 146442 3 laszlo.gombos 2009-09-10 20:12:06 -0700 Thanks Eric for the review. Landed as http://trac.webkit.org/changeset/48280. 39396 2009-09-10 17:13:13 -0700 2009-09-10 20:12:38 -0700 proposed patch patch_29162.txt text/plain 11566 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODI3NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMDktMDktMTAgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gRml4IGNvbXBhcmlzb24gYmV0d2VlbiBzaWduZWQgYW5kIHVuc2lnbmVkIGlu dGVnZXIgd2FybmluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI5MTYyCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2UuCisKKyAgICAgICAg KiBicmlkZ2UvcXQvcXRfcnVudGltZS5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpmaW5k TWV0aG9kSW5kZXgpOgorICAgICAgICAqIHBsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6aW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRVR5cGVzKToKKyAg ICAgICAgKFdlYkNvcmU6OmluaXRpYWxpemVTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlc0ZvckVuY29k aW5nKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlRGVjb2RlclF0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkltYWdlRGVjb2RlclF0OjpkdXJhdGlvbik6CisgICAgICAgIChXZWJDb3Jl OjpJbWFnZURlY29kZXJRdDo6aW1hZ2VBdEluZGV4KToKKyAgICAgICAgKiBwbHVnaW5zL3F0L1Bs dWdpblBhY2thZ2VRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5QYWNrYWdlOjpmZXRj aEluZm8pOgorCiAyMDA5LTA5LTA4ICBKb2huIEFiZC1FbC1NYWxlayAgPGphbUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViQ29y ZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2Uv cXQvcXRfcnVudGltZS5jcHAJKHJldmlzaW9uIDQ4MjUzKQorKysgV2ViQ29yZS9icmlkZ2UvcXQv cXRfcnVudGltZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNjMsNyArMTE2Myw3IEBAIHN0YXRp YyBpbnQgZmluZE1ldGhvZEluZGV4KEV4ZWNTdGF0ZSogZXgKICAgICAgICAgfQogCiAgICAgICAg IC8vIElmIHRoZSBuYXRpdmUgbWV0aG9kIHJlcXVpcmVzIG1vcmUgYXJndW1lbnRzIHRoYW4gd2hh dCB3YXMgcGFzc2VkIGZyb20gSmF2YVNjcmlwdAotICAgICAgICBpZiAoanNBcmdzLnNpemUoKSA8 ICh0eXBlcy5jb3VudCgpIC0gMSkpIHsKKyAgICAgICAgaWYgKGpzQXJncy5zaXplKCkgKyAxIDwg c3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHR5cGVzLmNvdW50KCkpKSB7CiAgICAgICAgICAgICBxTWF0 Y2hEZWJ1ZygpIDw8ICJNYXRjaDp0b28gZmV3IGFyZ3MgZm9yIiA8PCBtZXRob2Quc2lnbmF0dXJl KCk7CiAgICAgICAgICAgICB0b29GZXdBcmdzLmFwcGVuZChpbmRleCk7CiAgICAgICAgICAgICBj b250aW51ZTsKQEAgLTExODYsNyArMTE4Niw3IEBAIHN0YXRpYyBpbnQgZmluZE1ldGhvZEluZGV4 KEV4ZWNTdGF0ZSogZXgKIAogICAgICAgICBib29sIGNvbnZlcnRlZCA9IHRydWU7CiAgICAgICAg IGludCBtYXRjaERpc3RhbmNlID0gMDsKLSAgICAgICAgZm9yIChpbnQgaSA9IDA7IGNvbnZlcnRl ZCAmJiBpIDwgdHlwZXMuY291bnQoKSAtIDE7ICsraSkgeworICAgICAgICBmb3IgKHVuc2lnbmVk IGkgPSAwOyBjb252ZXJ0ZWQgJiYgaSArIDEgPCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4odHlwZXMu Y291bnQoKSk7ICsraSkgewogICAgICAgICAgICAgSlNWYWx1ZSBhcmcgPSBpIDwganNBcmdzLnNp emUoKSA/IGpzQXJncy5hdChpKSA6IGpzVW5kZWZpbmVkKCk7CiAKICAgICAgICAgICAgIGludCBh cmdkaXN0YW5jZSA9IC0xOwpAQCAtMTIwMyw3ICsxMjAzLDcgQEAgc3RhdGljIGludCBmaW5kTWV0 aG9kSW5kZXgoRXhlY1N0YXRlKiBleAogICAgICAgICBxTWF0Y2hEZWJ1ZygpIDw8ICJNYXRjaDog IiA8PCBtZXRob2Quc2lnbmF0dXJlKCkgPDwgKGNvbnZlcnRlZCA/ICJjb252ZXJ0ZWQiOiJmYWls ZWQgdG8gY29udmVydCIpIDw8ICJkaXN0YW5jZSAiIDw8IG1hdGNoRGlzdGFuY2U7CiAKICAgICAg ICAgaWYgKGNvbnZlcnRlZCkgewotICAgICAgICAgICAgaWYgKChqc0FyZ3Muc2l6ZSgpID09IHR5 cGVzLmNvdW50KCkgLSAxKQorICAgICAgICAgICAgaWYgKChqc0FyZ3Muc2l6ZSgpICsgMSA9PSBz dGF0aWNfY2FzdDx1bnNpZ25lZD4odHlwZXMuY291bnQoKSkpCiAgICAgICAgICAgICAgICAgJiYg KG1hdGNoRGlzdGFuY2UgPT0gMCkpIHsKICAgICAgICAgICAgICAgICAvLyBwZXJmZWN0IG1hdGNo LCB1c2UgdGhpcyBvbmUKICAgICAgICAgICAgICAgICBjaG9zZW5JbmRleCA9IGluZGV4OwpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCShyZXZpc2lvbiA0ODI1MykKKysr IFdlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTkyLDcgKzkyLDcgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVN1cHBvcnRlZEltYWdlTUlNRQog CiAjZWxpZiBQTEFURk9STShRVCkKICAgICBRTGlzdDxRQnl0ZUFycmF5PiBmb3JtYXRzID0gUUlt YWdlUmVhZGVyOjpzdXBwb3J0ZWRJbWFnZUZvcm1hdHMoKTsKLSAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGZvcm1hdHMuc2l6ZSgpOyArK2kpIHsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IHN0YXRpY19jYXN0PHNpemVfdD4oZm9ybWF0cy5zaXplKCkpOyArK2kpIHsKICNpZiBFTkFCTEUo U1ZHKQogICAgICAgICAvKgogICAgICAgICAgKiBRdCBoYXMgc3VwcG9ydCBmb3IgU1ZHLCBidXQg d2Ugd2FudCB0byB1c2UgS1NWRzIKQEAgLTE0OSw3ICsxNDksNyBAQCBzdGF0aWMgdm9pZCBpbml0 aWFsaXplU3VwcG9ydGVkSW1hZ2VNSU1FCiAjZW5kaWYKICNlbGlmIFBMQVRGT1JNKFFUKQogICAg IFFMaXN0PFFCeXRlQXJyYXk+IGZvcm1hdHMgPSBRSW1hZ2VXcml0ZXI6OnN1cHBvcnRlZEltYWdl Rm9ybWF0cygpOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZm9ybWF0cy5zaXplKCk7ICsr aSkgeworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgZm9ybWF0cy5zaXplKCk7ICsraSkgewogICAg ICAgICBTdHJpbmcgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4 dGVuc2lvbihmb3JtYXRzLmF0KGkpLmNvbnN0RGF0YSgpKTsKICAgICAgICAgc3VwcG9ydGVkSW1h Z2VNSU1FVHlwZXNGb3JFbmNvZGluZy0+YWRkKG1pbWVUeXBlKTsKICAgICB9CkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAko cmV2aXNpb24gNDgyNTMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNz Q29udGV4dFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODUxLDcgKzg1MSw3IEBAIHZvaWQgR3Jh cGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnMKICAgICBRUGFpbnRlclBhdGggbmV3UGF0 aCA9IHN0cm9rZXIuY3JlYXRlU3Ryb2tlKHBhdGgpOwogICAgIHAtPnN0cm9rZVBhdGgobmV3UGF0 aCwgblBlbik7CiAjZWxzZQotICAgIGZvciAoaW50IGkgPSAwOyBpIDwgcmVjdENvdW50OyArK2kp CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHJlY3RDb3VudDsgKytpKQogICAgICAgICBw LT5kcmF3UmVjdChRUmVjdEYocmVjdHNbaV0pKTsKICNlbmRpZgogICAgIHAtPnNldFBlbihvbGRQ ZW4pOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZURlY29kZXJRdC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZURlY29k ZXJRdC5jcHAJKHJldmlzaW9uIDQ4MjUzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9JbWFnZURlY29kZXJRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4OSw3ICsyODksNyBAQCBi b29sIEltYWdlRGVjb2RlclF0OjpzdXBwb3J0c0FscGhhKCkgY29uCiAKIGludCBJbWFnZURlY29k ZXJRdDo6ZHVyYXRpb24oc2l6ZV90IGluZGV4KSBjb25zdAogewotICAgIGlmIChpbmRleCA+PSBt X2ltYWdlTGlzdC5zaXplKCkpCisgICAgaWYgKGluZGV4ID49IHN0YXRpY19jYXN0PHNpemVfdD4o bV9pbWFnZUxpc3Quc2l6ZSgpKSkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgcmV0dXJuICBtX2lt YWdlTGlzdFtpbmRleF0ubV9kdXJhdGlvbjsKIH0KQEAgLTMxMiw3ICszMTIsNyBAQCBRUGl4bWFw KiBJbWFnZURlY29kZXJRdDo6aW1hZ2VBdEluZGV4KHNpCiAgICAgaWYgKGRlYnVnSW1hZ2VEZWNv ZGVyUXQpCiAgICAgICAgIHFEZWJ1ZygpIDw8ICJJbWFnZURlY29kZXJRdDo6aW1hZ2VBdEluZGV4 KCIgPDwgaW5kZXggPDwgJyknOwogCi0gICAgaWYgKGluZGV4ID49IG1faW1hZ2VMaXN0LnNpemUo KSkKKyAgICBpZiAoaW5kZXggPj0gc3RhdGljX2Nhc3Q8c2l6ZV90PihtX2ltYWdlTGlzdC5zaXpl KCkpKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIGlmICghbV9waXhtYXBDYWNoZS5jb250YWlu cyhpbmRleCkpIHsKSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5QYWNrYWdlUXQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5QYWNrYWdlUXQuY3BwCShy ZXZpc2lvbiA0ODI1MykKKysrIFdlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5QYWNrYWdlUXQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC02Myw3ICs2Myw3IEBAIGJvb2wgUGx1Z2luUGFja2FnZTo6ZmV0 Y2hJbmZvKCkKICAgICBTdHJpbmcgcyA9IGdtKCk7CiAgICAgVmVjdG9yPFN0cmluZz4gdHlwZXM7 CiAgICAgcy5zcGxpdChVQ2hhcignOycpLCBmYWxzZSwgdHlwZXMpOwotICAgIGZvciAoaW50IGkg PSAwOyBpIDwgdHlwZXMuc2l6ZSgpOyArK2kpIHsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgdHlwZXMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgVmVjdG9yPFN0cmluZz4gbWltZTsKICAg ICAgICAgdHlwZXNbaV0uc3BsaXQoVUNoYXIoJzonKSwgdHJ1ZSwgbWltZSk7CiAgICAgICAgIGlm IChtaW1lLnNpemUoKSA+IDApIHsKSW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L3F0L0NoYW5nZUxvZwkocmV2aXNpb24gNDgyNzYpCisrKyBXZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMDktMDktMTAgIExh c3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IGNvbXBhcmlzb24gYmV0 d2VlbiBzaWduZWQgYW5kIHVuc2lnbmVkIGludGVnZXIgd2FybmluZ3MKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5MTYyCisKKyAgICAgICAgTm8gZnVu Y3Rpb25hbCBjaGFuZ2UuCisKKyAgICAgICAgKiBBcGkvcXdlYmVsZW1lbnQuY3BwOgorICAgICAg ICAoUVdlYkVsZW1lbnQ6OmZpbmRBbGwpOgorICAgICAgICAqIEFwaS9xd2ViaGlzdG9yeS5jcHA6 CisgICAgICAgIChRV2ViSGlzdG9yeTo6aXRlbXMpOgorICAgICAgICAoUVdlYkhpc3Rvcnk6OmJh Y2tJdGVtcyk6CisgICAgICAgIChRV2ViSGlzdG9yeTo6Zm9yd2FyZEl0ZW1zKToKKyAgICAgICAg KFFXZWJIaXN0b3J5OjpzYXZlU3RhdGUpOgorICAgICAgICAqIEFwaS9xd2VicGx1Z2luZGF0YWJh c2UuY3BwOgorICAgICAgICAoUVdlYlBsdWdpbkRhdGFiYXNlOjpzZXRTZWFyY2hQYXRocyk6Cisg ICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q2hyb21lQ2xpZW50UXQ6OnJ1bk9wZW5QYW5lbCk6CisgICAgICAgICogV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv YWRlckNsaWVudFF0OjpjcmVhdGVQbHVnaW4pOgorCiAyMDA5LTA5LTEwICBTaW1vbiBIYXVzbWFu biAgPGhhdXNtYW5uQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgQXJp eWEgSGlkYXlhdC4KSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYmVsZW1lbnQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYmVsZW1lbnQuY3BwCShyZXZpc2lvbiA0ODI1MykKKysr IFdlYktpdC9xdC9BcGkvcXdlYmVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTksNyAr MjE5LDcgQEAgUUxpc3Q8UVdlYkVsZW1lbnQ+IFFXZWJFbGVtZW50OjpmaW5kQWxsKAogICAgIGlm ICghbm9kZXMpCiAgICAgICAgIHJldHVybiBlbGVtZW50czsKIAotICAgIGZvciAoaW50IGkgPSAw OyBpIDwgbm9kZXMtPmxlbmd0aCgpOyArK2kpIHsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgbm9kZXMtPmxlbmd0aCgpOyArK2kpIHsKICAgICAgICAgV2ViQ29yZTo6Tm9kZSogbiA9IG5v ZGVzLT5pdGVtKGkpOwogICAgICAgICBlbGVtZW50cy5hcHBlbmQoUVdlYkVsZW1lbnQoc3RhdGlj X2Nhc3Q8RWxlbWVudCo+KG4pKSk7CiAgICAgfQpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2ViaGlz dG9yeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5jcHAJKHJl dmlzaW9uIDQ4MjUzKQorKysgV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTI3NSw3ICsyNzUsNyBAQCBRTGlzdDxRV2ViSGlzdG9yeUl0ZW0+IFFXZWJIaXN0 b3J5OjppdGVtCiAgICAgY29uc3QgV2ViQ29yZTo6SGlzdG9yeUl0ZW1WZWN0b3IgJml0ZW1zID0g ZC0+bHN0LT5lbnRyaWVzKCk7CiAKICAgICBRTGlzdDxRV2ViSGlzdG9yeUl0ZW0+IHJldDsKLSAg ICBmb3IgKGludCBpID0gMDsgaSA8IGl0ZW1zLnNpemUoKTsgKytpKSB7CisgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IGl0ZW1zLnNpemUoKTsgKytpKSB7CiAgICAgICAgIFFXZWJIaXN0b3J5 SXRlbVByaXZhdGUgKnByaXYgPSBuZXcgUVdlYkhpc3RvcnlJdGVtUHJpdmF0ZShpdGVtc1tpXS5n ZXQoKSk7CiAgICAgICAgIHJldC5hcHBlbmQoUVdlYkhpc3RvcnlJdGVtKHByaXYpKTsKICAgICB9 CkBAIC0yOTQsNyArMjk0LDcgQEAgUUxpc3Q8UVdlYkhpc3RvcnlJdGVtPiBRV2ViSGlzdG9yeTo6 YmFjawogICAgIGQtPmxzdC0+YmFja0xpc3RXaXRoTGltaXQobWF4SXRlbXMsIGl0ZW1zKTsKIAog ICAgIFFMaXN0PFFXZWJIaXN0b3J5SXRlbT4gcmV0OwotICAgIGZvciAoaW50IGkgPSAwOyBpIDwg aXRlbXMuc2l6ZSgpOyArK2kpIHsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaXRlbXMu c2l6ZSgpOyArK2kpIHsKICAgICAgICAgUVdlYkhpc3RvcnlJdGVtUHJpdmF0ZSAqcHJpdiA9IG5l dyBRV2ViSGlzdG9yeUl0ZW1Qcml2YXRlKGl0ZW1zW2ldLmdldCgpKTsKICAgICAgICAgcmV0LmFw cGVuZChRV2ViSGlzdG9yeUl0ZW0ocHJpdikpOwogICAgIH0KQEAgLTMxMyw3ICszMTMsNyBAQCBR TGlzdDxRV2ViSGlzdG9yeUl0ZW0+IFFXZWJIaXN0b3J5Ojpmb3J3CiAgICAgZC0+bHN0LT5mb3J3 YXJkTGlzdFdpdGhMaW1pdChtYXhJdGVtcywgaXRlbXMpOwogCiAgICAgUUxpc3Q8UVdlYkhpc3Rv cnlJdGVtPiByZXQ7Ci0gICAgZm9yIChpbnQgaSA9IDA7IGkgPCBpdGVtcy5zaXplKCk7ICsraSkg eworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBpdGVtcy5zaXplKCk7ICsraSkgewogICAg ICAgICBRV2ViSGlzdG9yeUl0ZW1Qcml2YXRlICpwcml2ID0gbmV3IFFXZWJIaXN0b3J5SXRlbVBy aXZhdGUoaXRlbXNbaV0uZ2V0KCkpOwogICAgICAgICByZXQuYXBwZW5kKFFXZWJIaXN0b3J5SXRl bShwcml2KSk7CiAgICAgfQpAQCAtNTM3LDcgKzUzNyw3IEBAIFFCeXRlQXJyYXkgUVdlYkhpc3Rv cnk6OnNhdmVTdGF0ZShIaXN0b3IKICAgICAgICAgc3RyZWFtIDw8IGNvdW50KCkgPDwgY3VycmVu dEl0ZW1JbmRleCgpOwogCiAgICAgICAgIGNvbnN0IFdlYkNvcmU6Okhpc3RvcnlJdGVtVmVjdG9y ICZpdGVtcyA9IGQtPmxzdC0+ZW50cmllcygpOwotICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8 IGl0ZW1zLnNpemUoKTsgaSsrKQorICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaXRl bXMuc2l6ZSgpOyBpKyspCiAgICAgICAgICAgICBpdGVtc1tpXS5nZXQoKS0+c2F2ZVN0YXRlKHN0 cmVhbSwgdmVyc2lvbik7CiAKICAgICAgICAgaWYgKHN0cmVhbS5zdGF0dXMoKSAhPSBRRGF0YVN0 cmVhbTo6T2spCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJwbHVnaW5kYXRhYmFzZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2VicGx1Z2luZGF0YWJhc2UuY3BwCShyZXZpc2lv biA0ODI1MykKKysrIFdlYktpdC9xdC9BcGkvcXdlYnBsdWdpbmRhdGFiYXNlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMzE5LDcgKzMxOSw3IEBAIHZvaWQgUVdlYlBsdWdpbkRhdGFiYXNlOjpzZXRT ZWFyY2hQYXRocygKIHsKICAgICBWZWN0b3I8U3RyaW5nPiBkaXJlY3RvcmllczsKIAotICAgIGZv ciAodW5zaWduZWQgaW50IGkgPSAwOyBpIDwgcGF0aHMuY291bnQoKTsgKytpKQorICAgIGZvciAo aW50IGkgPSAwOyBpIDwgcGF0aHMuY291bnQoKTsgKytpKQogICAgICAgICBkaXJlY3Rvcmllcy5h cHBlbmQocGF0aHMuYXQoaSkpOwogCiAgICAgbV9kYXRhYmFzZS0+c2V0UGx1Z2luRGlyZWN0b3Jp ZXMoZGlyZWN0b3JpZXMpOwpJbmRleDogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNs aWVudFF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21l Q2xpZW50UXQuY3BwCShyZXZpc2lvbiA0ODI1MykKKysrIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9y dC9DaHJvbWVDbGllbnRRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyMCw3ICs0MjAsNyBAQCB2 b2lkIENocm9tZUNsaWVudFF0OjpydW5PcGVuUGFuZWwoRnJhbWUqCiAgICAgICAgIG9wdGlvbi5w YXJlbnRGcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmtpdChmcmFtZSk7CiAKICAgICAgICAgaWYg KCFmaWxlQ2hvb3Nlci0+ZmlsZW5hbWVzKCkuaXNFbXB0eSgpKQotICAgICAgICAgICAgZm9yIChp bnQgaSA9IDA7IGkgPCBmaWxlQ2hvb3Nlci0+ZmlsZW5hbWVzKCkuc2l6ZSgpOyArK2kpCisgICAg ICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgZmlsZUNob29zZXItPmZpbGVuYW1lcygp LnNpemUoKTsgKytpKQogICAgICAgICAgICAgICAgIG9wdGlvbi5zdWdnZXN0ZWRGaWxlTmFtZXMg Kz0gZmlsZUNob29zZXItPmZpbGVuYW1lcygpW2ldOwogCiAgICAgICAgIFFXZWJQYWdlOjpDaG9v c2VNdWx0aXBsZUZpbGVzRXh0ZW5zaW9uUmV0dXJuIG91dHB1dDsKSW5kZXg6IFdlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAJKHJldmlzaW9uIDQ4 MjUzKQorKysgV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMDkzLDEyICsxMDkzLDEyIEBAIFBhc3NSZWZQdHI8V2lkZ2V0 PiBGcmFtZUxvYWRlckNsaWVudFF0OjoKICAgICBRU3RyaW5nTGlzdCB2YWx1ZXM7CiAgICAgUVN0 cmluZyBjbGFzc2lkKGVsZW1lbnQtPmdldEF0dHJpYnV0ZSgiY2xhc3NpZCIpKTsKIAotICAgIGZv ciAoaW50IGkgPSAwOyBpIDwgcGFyYW1OYW1lcy5zaXplKCk7ICsraSkgeworICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBwYXJhbU5hbWVzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIHBhcmFt cy5hcHBlbmQocGFyYW1OYW1lc1tpXSk7CiAgICAgICAgIGlmIChwYXJhbU5hbWVzW2ldID09ICJj bGFzc2lkIikKICAgICAgICAgICAgIGNsYXNzaWQgPSBwYXJhbVZhbHVlc1tpXTsKICAgICB9Ci0g ICAgZm9yIChpbnQgaSA9IDA7IGkgPCBwYXJhbVZhbHVlcy5zaXplKCk7ICsraSkKKyAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgcGFyYW1WYWx1ZXMuc2l6ZSgpOyArK2kpCiAgICAgICAgIHZh bHVlcy5hcHBlbmQocGFyYW1WYWx1ZXNbaV0pOwogCiAgICAgUVN0cmluZyB1cmxTdHIodXJsLnN0 cmluZygpKTsKQEAgLTExMTYsNyArMTExNiw3IEBAIFBhc3NSZWZQdHI8V2lkZ2V0PiBGcmFtZUxv YWRlckNsaWVudFF0OjoKICAgICAgICAgICAgIGlmICghc3R5bGVTaGVldC5pc0VtcHR5KCkpCiAg ICAgICAgICAgICAgICAgc3R5bGVTaGVldCArPSBRTGF0aW4xQ2hhcignOycpOwogCi0gICAgICAg ICAgICBmb3IgKGludCBpID0gMDsgaSA8IG51bXFTdHlsZVNoZWV0UHJvcGVydGllczsgKytpKSB7 CisgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbnVtcVN0eWxlU2hlZXRQcm9w ZXJ0aWVzOyArK2kpIHsKICAgICAgICAgICAgICAgICBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5ID0g cXN0eWxlU2hlZXRQcm9wZXJ0aWVzW2ldOwogCiAgICAgICAgICAgICAgICAgc3R5bGVTaGVldCAr PSBRU3RyaW5nOjpmcm9tTGF0aW4xKDo6Z2V0UHJvcGVydHlOYW1lKHByb3BlcnR5KSk7Cg==