92683 2012-07-30 14:39:01 -0700 Crash in logging code if MIME type is null 2012-07-30 15:27:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca japhet jochen webkit.review.bot oldest_to_newest 682407 0 andersca 2012-07-30 14:39:01 -0700 Crash in logging code if MIME type is null 682428 1 155375 andersca 2012-07-30 15:04:09 -0700 Created attachment 155375 Patch 682463 2 andersca 2012-07-30 15:27:48 -0700 Committed r124102: <http://trac.webkit.org/changeset/124102> 155375 2012-07-30 15:04:09 -0700 2012-07-30 15:10:52 -0700 Patch bug-92683-20120730150353.patch text/plain 4992 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGM1MmNhNDAwN2YyYTQ0 ZGM3NjgxNmVhNDZlNDlmMGRlMWZmNjVjMy4uYmNjMTkyNmEzNDQ3OGI4NzQwZGE3MGY2OWFkNTk0 YWE5M2VhODU1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA3LTMwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3Jhc2ggaW4gbG9n Z2luZyBjb2RlIGlmIE1JTUUgdHlwZSBpcyBudWxsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjY4MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTE5 ODUyOTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg SWYgdGhlIE1JTUUgdHlwZSBpcyBudWxsLCB0cnkgdG8gZmlndXJlIGl0IG91dCBmcm9tIHRoZSBV UkwgZXh0ZW5zaW9uLiBJZiB0aGlzIGZhaWxzLCByZXR1cm4gZWFybHkgaW5zdGVhZCBvZiBjcmFz aGluZworICAgICAgICB0cnlpbmcgdG8gaW5zZXJ0IHRoZSBudWxsIHN0cmluZyBpbnRvIGEgaGFz aCBzZXQuCisKKyAgICAgICAgKiBsb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6bG9nUGx1Z2luUmVxdWVzdCk6CisKIDIwMTItMDctMzAgIEphbWVzIFJvYmluc29u ICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIENDVGhyZWFkVGFz ayBzaG91bGQgbm90IGRlcGVuZCBvbiBDcm9zc1RocmVhZFRhc2sgYW5kIGRvZXMgbm90IG5lZWQg dG8gZGVwZW5kIG9uIENyb3NzVGhyZWFkQ29waWVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZy YW1lTG9hZGVyLmNwcAppbmRleCA2M2NmYjNiNjRhNDQ3MjAzZTcyZGYyYjc1M2M1YmVkYzcyOTFk ZWQzLi5jMGEwOTdhMGJjZmU2N2U2MDQ3MjRiMDZlMzZjNzc3NTIyOTExMjA2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKQEAgLTEzNCwyMSArMTM0LDUyIEBAIGJv b2wgU3ViZnJhbWVMb2FkZXI6OnJlcXVlc3RQbHVnaW4oSFRNTFBsdWdJbkltYWdlRWxlbWVudCog b3duZXJFbGVtZW50LCBjb25zdCBLCiAgICAgcmV0dXJuIGxvYWRQbHVnaW4ob3duZXJFbGVtZW50 LCB1cmwsIG1pbWVUeXBlLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgdXNlRmFsbGJhY2spOwog fQogCi1zdGF0aWMgdm9pZCBsb2dQbHVnaW5SZXF1ZXN0KFBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmlu ZyYgbWltZVR5cGUsIGJvb2wgc3VjY2VzcykKK3N0YXRpYyBTdHJpbmcgZmluZFBsdWdpbk1JTUVU eXBlRnJvbVVSTChQYWdlKiBwYWdlLCBjb25zdCBTdHJpbmcmIHVybCkKK3sKKyAgICBpZiAoIXVy bCkKKyAgICAgICAgcmV0dXJuIFN0cmluZygpOworCisgICAgc2l6ZV90IGRvdEluZGV4ID0gdXJs LnJldmVyc2VGaW5kKCcuJyk7CisgICAgaWYgKGRvdEluZGV4ID09IG5vdEZvdW5kKQorICAgICAg ICByZXR1cm4gU3RyaW5nKCk7CisKKyAgICBTdHJpbmcgZXh0ZW5zaW9uID0gdXJsLnN1YnN0cmlu Zyhkb3RJbmRleCArIDEpOworCisgICAgUGx1Z2luRGF0YSogcGx1Z2luRGF0YSA9IHBhZ2UtPnBs dWdpbkRhdGEoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHBsdWdpbkRhdGEtPm1pbWVz KCkuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgY29uc3QgTWltZUNsYXNzSW5mbyYgbWltZUNsYXNz SW5mbyA9IHBsdWdpbkRhdGEtPm1pbWVzKClbaV07CisgICAgICAgIGZvciAoc2l6ZV90IGogPSAw OyBqIDwgbWltZUNsYXNzSW5mby5leHRlbnNpb25zLnNpemUoKTsgKytqKSB7CisgICAgICAgICAg ICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZXh0ZW5zaW9uLCBtaW1lQ2xhc3NJbmZvLmV4dGVuc2lv bnNbal0pKQorICAgICAgICAgICAgICAgIHJldHVybiBtaW1lQ2xhc3NJbmZvLnR5cGU7CisgICAg ICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gU3RyaW5nKCk7Cit9CisKK3N0YXRpYyB2b2lkIGxv Z1BsdWdpblJlcXVlc3QoUGFnZSogcGFnZSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3Qg U3RyaW5nJiB1cmwsIGJvb2wgc3VjY2VzcykKIHsKICAgICBpZiAoIXBhZ2UgfHwgIXBhZ2UtPnNl dHRpbmdzKCktPmRpYWdub3N0aWNMb2dnaW5nRW5hYmxlZCgpKQogICAgICAgICByZXR1cm47Ci0g ICAgCisKKyAgICBTdHJpbmcgbmV3TUlNRVR5cGUgPSBtaW1lVHlwZTsKKyAgICBpZiAoIW5ld01J TUVUeXBlKSB7CisgICAgICAgIC8vIFRyeSB0byBmaWd1cmUgb3V0IHRoZSBNSU1FIHR5cGUgZnJv bSB0aGUgVVJMIGV4dGVuc2lvbi4KKyAgICAgICAgbmV3TUlNRVR5cGUgPSBmaW5kUGx1Z2luTUlN RVR5cGVGcm9tVVJMKHBhZ2UsIHVybCk7CisgICAgICAgIGlmICghbmV3TUlNRVR5cGUpCisgICAg ICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgQ2hyb21lQ2xpZW50KiBjbGllbnQgPSBwYWdl LT5jaHJvbWUoKS0+Y2xpZW50KCk7Ci0gICAgY2xpZW50LT5sb2dEaWFnbm9zdGljTWVzc2FnZShz dWNjZXNzID8gRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwbHVnaW5Mb2FkZWRLZXkoKSA6IERpYWdu b3N0aWNMb2dnaW5nS2V5czo6cGx1Z2luTG9hZGluZ0ZhaWxlZEtleSgpLCBtaW1lVHlwZSwgRGlh Z25vc3RpY0xvZ2dpbmdLZXlzOjpub29wS2V5KCkpOworICAgIGNsaWVudC0+bG9nRGlhZ25vc3Rp Y01lc3NhZ2Uoc3VjY2VzcyA/IERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGx1Z2luTG9hZGVkS2V5 KCkgOiBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBsdWdpbkxvYWRpbmdGYWlsZWRLZXkoKSwgbmV3 TUlNRVR5cGUsIERpYWdub3N0aWNMb2dnaW5nS2V5czo6bm9vcEtleSgpKTsKICAgICAKICAgICBp ZiAoIXBhZ2UtPmhhc1NlZW5BbnlQbHVnaW4oKSkKICAgICAgICAgY2xpZW50LT5sb2dEaWFnbm9z dGljTWVzc2FnZShEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBhZ2VDb250YWluc0F0TGVhc3RPbmVQ bHVnaW5LZXkoKSwgZW1wdHlTdHJpbmcoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpub29wS2V5 KCkpOwogICAgIAotICAgIGlmICghcGFnZS0+aGFzU2VlblBsdWdpbihtaW1lVHlwZSkpCi0gICAg ICAgIGNsaWVudC0+bG9nRGlhZ25vc3RpY01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpw YWdlQ29udGFpbnNQbHVnaW5LZXkoKSwgbWltZVR5cGUsIERpYWdub3N0aWNMb2dnaW5nS2V5czo6 bm9vcEtleSgpKTsKKyAgICBpZiAoIXBhZ2UtPmhhc1NlZW5QbHVnaW4obmV3TUlNRVR5cGUpKQor ICAgICAgICBjbGllbnQtPmxvZ0RpYWdub3N0aWNNZXNzYWdlKERpYWdub3N0aWNMb2dnaW5nS2V5 czo6cGFnZUNvbnRhaW5zUGx1Z2luS2V5KCksIG5ld01JTUVUeXBlLCBEaWFnbm9zdGljTG9nZ2lu Z0tleXM6Om5vb3BLZXkoKSk7CiAKLSAgICBwYWdlLT5zYXdQbHVnaW4obWltZVR5cGUpOworICAg IHBhZ2UtPnNhd1BsdWdpbihuZXdNSU1FVHlwZSk7CiB9CiAKIGJvb2wgU3ViZnJhbWVMb2FkZXI6 OnJlcXVlc3RPYmplY3QoSFRNTFBsdWdJbkltYWdlRWxlbWVudCogb3duZXJFbGVtZW50LCBjb25z dCBTdHJpbmcmIHVybCwgY29uc3QgQXRvbWljU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IFN0cmlu ZyYgbWltZVR5cGUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0 b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMpCkBAIC0xNjksNyArMjAwLDcgQEAgYm9vbCBTdWJmcmFt ZUxvYWRlcjo6cmVxdWVzdE9iamVjdChIVE1MUGx1Z0luSW1hZ2VFbGVtZW50KiBvd25lckVsZW1l bnQsIGNvbnN0IFMKICAgICBib29sIHVzZUZhbGxiYWNrOwogICAgIGlmIChzaG91bGRVc2VQbHVn aW4oY29tcGxldGVkVVJMLCBtaW1lVHlwZSwgb3duZXJFbGVtZW50LT5zaG91bGRQcmVmZXJQbHVn SW5zRm9ySW1hZ2VzKCksIHJlbmRlcmVyLT5oYXNGYWxsYmFja0NvbnRlbnQoKSwgdXNlRmFsbGJh Y2spKSB7CiAgICAgICAgIGJvb2wgc3VjY2VzcyA9IHJlcXVlc3RQbHVnaW4ob3duZXJFbGVtZW50 LCBjb21wbGV0ZWRVUkwsIG1pbWVUeXBlLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgdXNlRmFs bGJhY2spOwotICAgICAgICBsb2dQbHVnaW5SZXF1ZXN0KGRvY3VtZW50KCktPnBhZ2UoKSwgbWlt ZVR5cGUsIHN1Y2Nlc3MpOworICAgICAgICBsb2dQbHVnaW5SZXF1ZXN0KGRvY3VtZW50KCktPnBh Z2UoKSwgbWltZVR5cGUsIGNvbXBsZXRlZFVSTCwgc3VjY2Vzcyk7CiAgICAgICAgIHJldHVybiBz dWNjZXNzOwogICAgIH0KIApAQCAtMjUzLDcgKzI4NCw3IEBAIFBhc3NSZWZQdHI8V2lkZ2V0PiBT dWJmcmFtZUxvYWRlcjo6Y3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRTaXplJiBzaXpl LCBICiAgICAgaWYgKGFsbG93UGx1Z2lucyhBYm91dFRvSW5zdGFudGlhdGVQbHVnaW4pKQogICAg ICAgICB3aWRnZXQgPSBtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCktPmNyZWF0ZUphdmFBcHBs ZXRXaWRnZXQoc2l6ZSwgZWxlbWVudCwgYmFzZVVSTCwgcGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMp OwogCi0gICAgbG9nUGx1Z2luUmVxdWVzdChkb2N1bWVudCgpLT5wYWdlKCksIGVsZW1lbnQtPnNl cnZpY2VUeXBlKCksIHdpZGdldCk7CisgICAgbG9nUGx1Z2luUmVxdWVzdChkb2N1bWVudCgpLT5w YWdlKCksIGVsZW1lbnQtPnNlcnZpY2VUeXBlKCksIFN0cmluZygpLCB3aWRnZXQpOwogCiAgICAg aWYgKCF3aWRnZXQpIHsKICAgICAgICAgUmVuZGVyRW1iZWRkZWRPYmplY3QqIHJlbmRlcmVyID0g ZWxlbWVudC0+cmVuZGVyRW1iZWRkZWRPYmplY3QoKTsK