136393 2014-08-29 15:57:56 -0700 Use jsNontrivialString for strings we know are more than a single character 2014-09-02 13:14:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned benjamin commit-queue oldest_to_newest 1032278 0 joepeck 2014-08-29 15:57:56 -0700 There are some opportunities to use jsNontrivialString in JSCryptoKeySerializationJWK.cpp. 1032279 1 237385 joepeck 2014-08-29 15:59:01 -0700 Created attachment 237385 [PATCH] Proposed Fix 1032720 2 237385 ggaren 2014-09-02 12:38:38 -0700 Comment on attachment 237385 [PATCH] Proposed Fix r=me 1032723 3 237385 commit-queue 2014-09-02 13:14:43 -0700 Comment on attachment 237385 [PATCH] Proposed Fix Clearing flags on attachment: 237385 Committed r173183: <http://trac.webkit.org/changeset/173183> 1032724 4 commit-queue 2014-09-02 13:14:47 -0700 All reviewed patches have been landed. Closing bug. 237385 2014-08-29 15:59:01 -0700 2014-09-02 13:14:43 -0700 [PATCH] Proposed Fix nontrivialstring.patch text/plain 2996 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5OWQyZjQ5Li4wMDRmOGFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTQtMDgtMjkgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBVc2UganNOb250cml2aWFsU3RyaW5nIGZvciBzdHJpbmdzIHdlIGtub3cgYXJlIG1v cmUgdGhhbiBhIHNpbmdsZSBjaGFyYWN0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNjM5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNDcnlwdG9LZXlTZXJpYWxpemF0aW9u SldLLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFkZFVzYWdlc1RvSlNPTik6CisKKzIwMTQtMDgt MjkgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBVc2Ug VVRGOEVuY29kaW5nIGluIG1vcmUgcGxhY2VzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYzOTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNDcnlwdG9LZXlTZXJpYWxpemF0aW9uSldLLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTQ3J5cHRvS2V5U2VyaWFsaXphdGlvbkpXSy5jcHAKaW5kZXggYmU2 ZTFlMC4uNDM2YTMzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlND cnlwdG9LZXlTZXJpYWxpemF0aW9uSldLLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0NyeXB0b0tleVNlcmlhbGl6YXRpb25KV0suY3BwCkBAIC02NTgsMjEgKzY1OCwyMSBA QCBzdGF0aWMgdm9pZCBhZGRVc2FnZXNUb0pTT04oRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCog anNvbiwgQ3J5cHRvS2V5VXNhZ2UgdXNhZwogCiAgICAgdW5zaWduZWQgaW5kZXggPSAwOwogICAg IGlmICh1c2FnZXMgJiBDcnlwdG9LZXlVc2FnZVNpZ24pCi0gICAgICAgIGtleU9wcy0+cHV0RGly ZWN0SW5kZXgoZXhlYywgaW5kZXgrKywganNTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJzaWdu IikpKTsKKyAgICAgICAga2V5T3BzLT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBqc05v bnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJzaWduIikpKTsKICAgICBpZiAodXNh Z2VzICYgQ3J5cHRvS2V5VXNhZ2VWZXJpZnkpCi0gICAgICAgIGtleU9wcy0+cHV0RGlyZWN0SW5k ZXgoZXhlYywgaW5kZXgrKywganNTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJ2ZXJpZnkiKSkp OworICAgICAgICBrZXlPcHMtPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGpzTm9udHJp dmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoInZlcmlmeSIpKSk7CiAgICAgaWYgKHVzYWdl cyAmIENyeXB0b0tleVVzYWdlRW5jcnlwdCkKLSAgICAgICAga2V5T3BzLT5wdXREaXJlY3RJbmRl eChleGVjLCBpbmRleCsrLCBqc1N0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoImVuY3J5cHQiKSkp OworICAgICAgICBrZXlPcHMtPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGpzTm9udHJp dmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoImVuY3J5cHQiKSkpOwogICAgIGlmICh1c2Fn ZXMgJiBDcnlwdG9LZXlVc2FnZURlY3J5cHQpCi0gICAgICAgIGtleU9wcy0+cHV0RGlyZWN0SW5k ZXgoZXhlYywgaW5kZXgrKywganNTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJkZWNyeXB0Iikp KTsKKyAgICAgICAga2V5T3BzLT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBqc05vbnRy aXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJkZWNyeXB0IikpKTsKICAgICBpZiAodXNh Z2VzICYgQ3J5cHRvS2V5VXNhZ2VXcmFwS2V5KQotICAgICAgICBrZXlPcHMtPnB1dERpcmVjdElu ZGV4KGV4ZWMsIGluZGV4KyssIGpzU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgid3JhcEtleSIp KSk7CisgICAgICAgIGtleU9wcy0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywganNOb250 cml2aWFsU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgid3JhcEtleSIpKSk7CiAgICAgaWYgKHVz YWdlcyAmIENyeXB0b0tleVVzYWdlVW53cmFwS2V5KQotICAgICAgICBrZXlPcHMtPnB1dERpcmVj dEluZGV4KGV4ZWMsIGluZGV4KyssIGpzU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgidW53cmFw S2V5IikpKTsKKyAgICAgICAga2V5T3BzLT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBq c05vbnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJ1bndyYXBLZXkiKSkpOwogICAg IGlmICh1c2FnZXMgJiBDcnlwdG9LZXlVc2FnZURlcml2ZUtleSkKLSAgICAgICAga2V5T3BzLT5w dXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBqc1N0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwo ImRlcml2ZUtleSIpKSk7CisgICAgICAgIGtleU9wcy0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5k ZXgrKywganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgiZGVyaXZlS2V5Iikp KTsKICAgICBpZiAodXNhZ2VzICYgQ3J5cHRvS2V5VXNhZ2VEZXJpdmVCaXRzKQotICAgICAgICBr ZXlPcHMtPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGpzU3RyaW5nKGV4ZWMsIEFTQ0lJ TGl0ZXJhbCgiZGVyaXZlQml0cyIpKSk7CisgICAgICAgIGtleU9wcy0+cHV0RGlyZWN0SW5kZXgo ZXhlYywgaW5kZXgrKywganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgiZGVy aXZlQml0cyIpKSk7CiAKICAgICBqc29uLT5wdXREaXJlY3QoZXhlYy0+dm0oKSwgSWRlbnRpZmll cihleGVjLCAia2V5X29wcyIpLCBrZXlPcHMpOwogfQo=