118146 2013-06-27 13:56:54 -0700 Stop using deprecatedCharactersWithNullTermination in SQLite code 2013-06-27 16:14:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 904339 0 andersca 2013-06-27 13:56:54 -0700 Stop using deprecatedCharactersWithNullTermination in SQLite code 904340 1 205631 andersca 2013-06-27 14:02:25 -0700 Created attachment 205631 Patch 904372 2 andersca 2013-06-27 16:14:21 -0700 Committed r152134: <http://trac.webkit.org/changeset/152134> 205631 2013-06-27 14:02:25 -0700 2013-06-27 15:31:19 -0700 Patch bug-118146-20130627140026.patch text/plain 6710 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjM1YjNjMzZkZGQwZTI3 ZDNjZGJkZmMxYjAzYzkxMDRhYWQxZWNlOC4uYTkyMDg1OWE0YTM3NzI5NTNiY2UzNjU2MDNlM2U0 ZTg3YjI1Yzg0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTA2LTI3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCB1c2luZyBk ZXByZWNhdGVkQ2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24gaW4gU1FMaXRlIGNvZGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODE0NgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR1cm5zIG91dCBT UUxpdGUgdXNlcyBVVEYtOCBpbnRlcm5hbGx5IHNvIHdlIG1pZ2h0IGp1c3QgYXMgd2VsbCB1c2Ug dGhlIFNRTGl0ZSBmdW5jdGlvbnMKKyAgICAgICAgdGhhdCB0YWtlIFVURi04IHN0cmluZ3MgYW5k IGRvIHRoZSBjb252ZXJzaW9uIG91cnNlbHZlcy4gVGhpcyBoYXMgdGhlIGFkZGVkIGFkdmFudGFn ZSB0aGF0IHdlIGNhbgorICAgICAgICB1c2UgU3RyaW5nOjp1dGY4KCkgd2hpY2ggcmV0dXJucyBh IG51bGwtdGVybWluYXRlZCBzdHJpbmcuCisKKyAgICAgICAgUmVxdWlyZSBhIHZlcnNpb24gb2Yg U1FMaXRlIG5ld2VyIHRoYW4gMy42LjE2IHNvIHdlIGNhbiByZW1vdmUgdHdvIHdvcmthcm91bmRz LiAzLjYuMTYgd2FzIHJlbGVhc2VkCisgICAgICAgIDQgeWVhcnMgYWdvIHNvIHN1cHBvcnRlZCBw b3J0IGlzIGxpa2VseSB0byBoYXZlIGl0LgorCisgICAgICAgICogcGxhdGZvcm0vc3FsL1NRTGl0 ZUZpbGVTeXN0ZW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6b3Bl bkRhdGFiYXNlKToKKyAgICAgICAgVXNlIHNxbGl0ZTNfb3BlbiBpbnN0ZWFkIG9mIHNxbGl0ZTNf b3BlbjE2LgorCisgICAgICAgICogcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uaDoKKyAg ICAgICAgRml4IHBhcmFtZXRlciBuYW1lIGNhcGl0YWxpemF0aW9uLgorCisgICAgICAgICogcGxh dGZvcm0vc3FsL1NRTGl0ZVN0YXRlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVT dGF0ZW1lbnQ6OnByZXBhcmUpOgorICAgICAgICBVc2Ugc3FsaXRlM19wcmVwYXJlX3YyLiBBbHNv LCBwYXNzIHRoZSBsZW5ndGggb2YgdGhlIHN0cmluZyAoaW5jbHVkaW5nIHRoZSBudWxsIGNoYXJh Y3RlciksIHNpbmNlCisgICAgICAgIHRoYXQgbGV0cyBTUUxpdGUgYXZvaWQgYSBidWZmZXIgY29w eS4gUmVtb3ZlIGEgd29ya2Fyb3VuZCBmb3IgdmVyc2lvbnMgb2YgU1FMaXRlIG9sZGVyIHRoYW4g My42LjE2LgorCiAyMDEzLTA2LTI3ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5z YW1zdW5nLmNvbT4KIAogICAgICAgICBSZW1vdmUgW05vSW50ZXJmYWNlT2JqZWN0XSBmcm9tIFdv cmtlckdsb2JhbFNjb3BlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwv U1FMaXRlRmlsZVN5c3RlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRl RmlsZVN5c3RlbS5jcHAKaW5kZXggY2JmODg4M2VkMzc2NDhlMjVkNmY2NmQwMTIzY2QwYTg4YWI3 ODMzZS4uNzM1ZjBiNDFmNzhlMmMyMzNhN2M5YmJjZjg3ZTIxMTA0YzAxMzc2MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVGaWxlU3lzdGVtLmNwcApAQCAtNDQs MTEgKzQ0LDkgQEAgU1FMaXRlRmlsZVN5c3RlbTo6U1FMaXRlRmlsZVN5c3RlbSgpCiB7CiB9CiAK LWludCBTUUxpdGVGaWxlU3lzdGVtOjpvcGVuRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmaWxlTmFt ZSwgc3FsaXRlMyoqIGRhdGFiYXNlLCBib29sKQoraW50IFNRTGl0ZUZpbGVTeXN0ZW06Om9wZW5E YXRhYmFzZShjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBzcWxpdGUzKiogZGF0YWJhc2UsIGJvb2wp CiB7Ci0gICAgLy8gU1FMaXRlIGV4cGVjdHMgYSBudWxsIHRlcm1pbmF0b3Igb24gaXRzIFVURi0x NiBzdHJpbmdzLgotICAgIFN0cmluZyBwYXRoID0gZmlsZU5hbWU7Ci0gICAgcmV0dXJuIHNxbGl0 ZTNfb3BlbjE2KHBhdGguZGVwcmVjYXRlZENoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCks IGRhdGFiYXNlKTsKKyAgICByZXR1cm4gc3FsaXRlM19vcGVuKGZpbGVuYW1lLnV0ZjgoKS5kYXRh KCksIGRhdGFiYXNlKTsKIH0KIAogU3RyaW5nIFNRTGl0ZUZpbGVTeXN0ZW06OmdldEZpbGVOYW1l Rm9yTmV3RGF0YWJhc2UoY29uc3QgU3RyaW5nJiBkYkRpciwgY29uc3QgU3RyaW5nJiwKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVGaWxlU3lzdGVtLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5c3RlbS5oCmluZGV4IDk4MDBm N2U1NDNhZGY2ZDQxOTFjZjllNTNiNGM4NjJmNzliOTkxMmEuLjE0MDg1YjkyOWM4NWI4N2FjMDU2 MmJjOWZlYzdhM2YxYzc3MDMxNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3NxbC9TUUxpdGVGaWxlU3lzdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3Fs L1NRTGl0ZUZpbGVTeXN0ZW0uaApAQCAtNDYsMTMgKzQ2LDEzIEBAIGNsYXNzIFNRTGl0ZUZpbGVT eXN0ZW0gewogcHVibGljOgogICAgIC8vIE9wZW5zIGEgZGF0YWJhc2UgZmlsZS4KICAgICAvLwot ICAgIC8vIGZpbGVOYW1lIC0gVGhlIG5hbWUgb2YgdGhlIGRhdGFiYXNlIGZpbGUuCisgICAgLy8g ZmlsZW1hbWUgLSBUaGUgbmFtZSBvZiB0aGUgZGF0YWJhc2UgZmlsZS4KICAgICAvLyBkYXRhYmFz ZSAtIFRoZSBTUUxpdGUgc3RydWN0dXJlIHRoYXQgcmVwcmVzZW50cyB0aGUgZGF0YWJhc2Ugc3Rv cmVkCiAgICAgLy8gICAgICAgICAgICBpbiB0aGUgZ2l2ZW4gZmlsZS4KICAgICAvLyBmb3JXZWJT UUxEYXRhYmFzZSAtIFRydWUsIGlmIGFuZCBvbmx5IGlmIHdlJ3JlIG9wZW5pbmcgYSBXZWIgU1FM IERhdGFiYXNlIGZpbGUuCiAgICAgLy8gICAgICAgICAgICAgICAgICAgICBVc2VkIGJ5IENocm9t aXVtIHRvIGRldGVybWluZSBpZiB0aGUgREIgZmlsZSBuZWVkcyB0byBiZSBvcGVuZWQKICAgICAv LyAgICAgICAgICAgICAgICAgICAgIHVzaW5nIGEgY3VzdG9tIFZGUy4KLSAgICBzdGF0aWMgaW50 IG9wZW5EYXRhYmFzZShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBzcWxpdGUzKiogZGF0YWJhc2Us IGJvb2wgZm9yV2ViU1FMRGF0YWJhc2UpOworICAgIHN0YXRpYyBpbnQgb3BlbkRhdGFiYXNlKGNv bnN0IFN0cmluZyYgZmlsZW5hbWUsIHNxbGl0ZTMqKiBkYXRhYmFzZSwgYm9vbCBmb3JXZWJTUUxE YXRhYmFzZSk7CiAKICAgICAvLyBSZXR1cm5zIHRoZSBmaWxlIG5hbWUgZm9yIGEgZGF0YWJhc2Uu CiAgICAgLy8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVT dGF0ZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVN0YXRlbWVu dC5jcHAKaW5kZXggZmQyYWYzMjg2MmQzNjMyYWVlNzE2OWE2OGMwMzVkMWI1MDMyZjkwYS4uMTIw M2U4NGVlOGFhNGFiNmY1YzFmOGEzYzJkYTI0NDIwMTg4ZDNmMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVN0YXRlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVN0YXRlbWVudC5jcHAKQEAgLTMyLDE4ICszMiwxNCBA QAogI2luY2x1ZGUgPHd0Zi9Bc3NlcnRpb25zLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5n SW1wbC5oPgogCi1uYW1lc3BhY2UgV2ViQ29yZSB7Ci0KLSNpZiBTUUxJVEVfVkVSU0lPTl9OVU1C RVIgPCAzMDAzMDA5Ci0KLS8vIEZJWE1FOiBUaGlzIG92ZXJsb2FkIGhlbHBzIHVzIGNvbXBpbGUg d2l0aCBvbGRlciB2ZXJzaW9ucyBvZiBTUUxpdGUgMywgYnV0IHRoaW5ncyBsaWtlIHF1b3RhcyB3 aWxsIG5vdCB3b3JrLgotc3RhdGljIGlubGluZSBpbnQgc3FsaXRlM19wcmVwYXJlMTZfdjIoc3Fs aXRlMyogZGIsIGNvbnN0IHZvaWQqIHpTcWwsIGludCBuQnl0ZXMsIHNxbGl0ZTNfc3RtdCoqIHBw U3RtdCwgY29uc3Qgdm9pZCoqIHB6VGFpbCkKLXsKLSAgICByZXR1cm4gc3FsaXRlM19wcmVwYXJl MTYoZGIsIHpTcWwsIG5CeXRlcywgcHBTdG10LCBwelRhaWwpOwotfQotCisvLyBTUUxpdGUgMy42 LjE2IG1ha2VzIHNxbGl0ZTNfcHJlcGFyZV92MiBhdXRvbWF0aWNhbGx5IHJldHJ5IHByZXBhcmlu ZyB0aGUgc3RhdGVtZW50CisvLyBvbmNlIGlmIHRoZSBkYXRhYmFzZSBzY2hlbWUgaGFzIGNoYW5n ZWQuIFdlIHJlbHkgb24gdGhpcyBiZWhhdmlvci4KKyNpZiBTUUxJVEVfVkVSU0lPTl9OVU1CRVIg PCAzMDA2MDE2CisjZXJyb3IgU1FMaXRlIHZlcnNpb24gMy42LjE2IG9yIG5ld2VyIGlzIHJlcXVp cmVkCiAjZW5kaWYKIAorbmFtZXNwYWNlIFdlYkNvcmUgeworCiBTUUxpdGVTdGF0ZW1lbnQ6OlNR TGl0ZVN0YXRlbWVudChTUUxpdGVEYXRhYmFzZSYgZGIsIGNvbnN0IFN0cmluZyYgc3FsKQogICAg IDogbV9kYXRhYmFzZShkYikKICAgICAsIG1fcXVlcnkoc3FsKQpAQCAtNjcsMjUgKzYzLDIzIEBA IGludCBTUUxpdGVTdGF0ZW1lbnQ6OnByZXBhcmUoKQogICAgIGlmIChtX2RhdGFiYXNlLmlzSW50 ZXJydXB0ZWQoKSkKICAgICAgICAgcmV0dXJuIFNRTElURV9JTlRFUlJVUFQ7CiAKLSAgICBjb25z dCB2b2lkKiB0YWlsID0gMDsKLSAgICBMT0coU1FMRGF0YWJhc2UsICJTUUwgLSBwcmVwYXJlIC0g JXMiLCBtX3F1ZXJ5LmFzY2lpKCkuZGF0YSgpKTsKLSAgICBTdHJpbmcgc3RyaXBwZWRRdWVyeSA9 IG1fcXVlcnkuc3RyaXBXaGl0ZVNwYWNlKCk7Ci0gICAgY29uc3QgVUNoYXIqIG51bGxUZXJtZWQg PSBzdHJpcHBlZFF1ZXJ5LmRlcHJlY2F0ZWRDaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigp OwotICAgIGludCBlcnJvciA9IHNxbGl0ZTNfcHJlcGFyZTE2X3YyKG1fZGF0YWJhc2Uuc3FsaXRl M0hhbmRsZSgpLCBudWxsVGVybWVkLCAtMSwgJm1fc3RhdGVtZW50LCAmdGFpbCk7Ci0KLSAgICAv LyBTdGFydGluZyB3aXRoIHZlcnNpb24gMy42LjE2LCBzcWxpdGUgaGFzIGEgcGF0Y2ggKGh0dHA6 Ly93d3cuc3FsaXRlLm9yZy9zcmMvY2kvMjU2ZWMzYzZhZikKLSAgICAvLyB0aGF0IHNob3VsZCBt YWtlIHN1cmUgc3FsaXRlM19wcmVwYXJlMTZfdjIgZG9lc24ndCByZXR1cm4gYSBTUUxJVEVfU0NI RU1BIGVycm9yLgotICAgIC8vIElmIHdlJ3JlIHVzaW5nIGFuIG9sZGVyIHNxbGl0ZSB2ZXJzaW9u LCB0cnkgdG8gZW11bGF0ZSB0aGUgcGF0Y2guCi0gICAgaWYgKGVycm9yID09IFNRTElURV9TQ0hF TUEpIHsKLSAgICAgIHNxbGl0ZTNfZmluYWxpemUobV9zdGF0ZW1lbnQpOwotICAgICAgZXJyb3Ig PSBzcWxpdGUzX3ByZXBhcmUxNl92MihtX2RhdGFiYXNlLnNxbGl0ZTNIYW5kbGUoKSwgbV9xdWVy eS5kZXByZWNhdGVkQ2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgLTEsICZtX3N0YXRl bWVudCwgJnRhaWwpOwotICAgIH0KKyAgICBDU3RyaW5nIHF1ZXJ5ID0gbV9xdWVyeS5zdHJpcFdo aXRlU3BhY2UoKS51dGY4KCk7CisgICAgCisgICAgTE9HKFNRTERhdGFiYXNlLCAiU1FMIC0gcHJl cGFyZSAtICVzIiwgcXVlcnkuZGF0YSgpKTsKKworICAgIC8vIFBhc3MgdGhlIGxlbmd0aCBvZiB0 aGUgc3RyaW5nIGluY2x1ZGluZyB0aGUgbnVsbCBjaGFyYWN0ZXIgdG8gc3FsaXRlM19wcmVwYXJl X3YyOworICAgIC8vIHRoaXMgbGV0cyBTUUxpdGUgYXZvaWQgYW4gZXh0cmEgc3RyaW5nIGNvcHku CisgICAgc2l6ZV90IGxlbmd0aEluY2x1ZGluZ051bGxDaGFyYWN0ZXIgPSBxdWVyeS5sZW5ndGgo KSArIDE7CisKKyAgICBjb25zdCBjaGFyKiB0YWlsOworICAgIGludCBlcnJvciA9IHNxbGl0ZTNf cHJlcGFyZV92MihtX2RhdGFiYXNlLnNxbGl0ZTNIYW5kbGUoKSwgcXVlcnkuZGF0YSgpLCBsZW5n dGhJbmNsdWRpbmdOdWxsQ2hhcmFjdGVyLCAmbV9zdGF0ZW1lbnQsICZ0YWlsKTsKIAogICAgIGlm IChlcnJvciAhPSBTUUxJVEVfT0spCi0gICAgICAgIExPRyhTUUxEYXRhYmFzZSwgInNxbGl0ZTNf cHJlcGFyZTE2IGZhaWxlZCAoJWkpXG4lc1xuJXMiLCBlcnJvciwgbV9xdWVyeS5hc2NpaSgpLmRh dGEoKSwgc3FsaXRlM19lcnJtc2cobV9kYXRhYmFzZS5zcWxpdGUzSGFuZGxlKCkpKTsKLSAgICBj b25zdCBVQ2hhciogY2ggPSBzdGF0aWNfY2FzdDxjb25zdCBVQ2hhcio+KHRhaWwpOwotICAgIGlm IChjaCAmJiAqY2gpCisgICAgICAgIExPRyhTUUxEYXRhYmFzZSwgInNxbGl0ZTNfcHJlcGFyZTE2 IGZhaWxlZCAoJWkpXG4lc1xuJXMiLCBlcnJvciwgcXVlcnkuZGF0YSgpLCBzcWxpdGUzX2Vycm1z ZyhtX2RhdGFiYXNlLnNxbGl0ZTNIYW5kbGUoKSkpOworCisgICAgaWYgKHRhaWwgJiYgKnRhaWwp CiAgICAgICAgIGVycm9yID0gU1FMSVRFX0VSUk9SOworCiAjaWZuZGVmIE5ERUJVRwogICAgIG1f aXNQcmVwYXJlZCA9IGVycm9yID09IFNRTElURV9PSzsKICNlbmRpZgo=