98965 2012-10-10 16:19:41 -0700 [WK2] Safari crashes on error when using CFNetwork 2012-10-10 19:24:37 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin sam oldest_to_newest 739378 0 benjamin 2012-10-10 16:19:41 -0700 <rdar://problem/12474758> 739401 1 168094 benjamin 2012-10-10 16:51:34 -0700 Created attachment 168094 Patch 739518 2 benjamin 2012-10-10 19:24:37 -0700 Committed r130996: <http://trac.webkit.org/changeset/130996> 168094 2012-10-10 16:51:34 -0700 2012-10-10 18:43:21 -0700 Patch bug-98965-20121010165032.patch text/plain 4359 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwOTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTgyMzA2YjZlOWY2OGQx NGU4ZjY5YWY1OWMxOWIwYTc0MWJhNDhkYS4uYzY0NTM4ZGE2ZTMzNmI2NTM2NTUzOTQ0YWFhZDU5 YWY3ZTdlZmVhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTEwLTEwICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIFNhZmFy aSBjcmFzaGVzIG9uIGVycm9yIHdoZW4gdXNpbmcgQ0ZOZXR3b3JrCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODk2NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjb2RlIG9mIFJlc291cmNlRXJyb3JN YWMgd2hlbiB1c2luZyBDRk5ldHdvcmsgd2FzIGFzc3VtaW5nCisgICAgICAgIHRoZXJlIGlzIGFs d2F5cyBlaXRoZXIgYSBDRkVycm9yIG9yIGFuIE5TRXJyb3IgYXNzb2NpYXRlZCB3aXRoCisgICAg ICAgIGFueSBSZXNvdXJjZUVycm9yLgorCisgICAgICAgIFRoaXMgaXMgbm90IHRydWUgb24gV2Vi S2l0MiB3aGVyZSBlcnJvciBjYW4gYmUgZ2VuZXJpYyBlcnJvcnMKKyAgICAgICAgaW4gdGhlIFdl YlByb2Nlc3MgKGZvciBleGFtcGxlIGEgY2Fubm90U2hvd1VSTEVycm9yKS4KKyAgICAgICAgVGhl IGNvZGUgd2FzIGNyYXNoaW5nIHdoZW4gdHJ5aW5nIHRvIGludm9rZSBmdW5jdGlvbiBvbiB0aGUK KyAgICAgICAgbm9uLWV4aXN0aW5nIENGRXJyb3IuCisKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhl cyB0aGUgaXNzdWUgYnkgaGFuZGxpbmcgdGhhdCB0aGlyZCBjYXNlIHNlcGFyYXRlbHkuCisgICAg ICAgIElmIHRoZSBSZXNvdXJjZUVycm9yIGlzIGEgZ2VuZXJpYyBlcnJvciwgYSBuZXcgTlNFcnJv ciBpcyBjcmVhdGVkLAorICAgICAgICBzaW1pbGFyaWx5IHRvIHdoYXQgaXMgZG9uZSBpbiB0aGUg bm9uLUNGTmV0d29yayBjYXNlLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9tYWMvUmVz b3VyY2VFcnJvck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlRXJyb3I6Om5zRXJy b3IpOgorCiAyMDEyLTEwLTEwICBLZW5pY2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBGb250VmVydGljYWxEYXRhQ2FjaGUgc2hvdWxkIGFsbG93IHplcm8gYXMg YSBrZXkgdmFsdWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv bWFjL1Jlc291cmNlRXJyb3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L21hYy9SZXNvdXJjZUVycm9yTWFjLm1tCmluZGV4IGU4Mzk5MGMzZDg3ODg1Mzc3NjkxNGM5Mjhj YjcyOGVmZTk4YmJiMmEuLjQxN2U5MDVhM2JiZWI0YTRlMGJlZWQ5OTM5YjZmY2M5NGU3NzQ3Mjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291cmNl RXJyb3JNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVz b3VyY2VFcnJvck1hYy5tbQpAQCAtMzcsNiArMzcsMjIgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCitzdGF0aWMgUmV0YWluUHRyPE5TRXJyb3I+IGNyZWF0ZU5TRXJyb3JGcm9tUmVzb3VyY2VF cnJvckJhc2UoY29uc3QgUmVzb3VyY2VFcnJvckJhc2UmIHJlc291cmNlRXJyb3IpCit7CisgICAg UmV0YWluUHRyPE5TTXV0YWJsZURpY3Rpb25hcnk+IHVzZXJJbmZvKEFkb3B0TlMsIFtbTlNNdXRh YmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdF0pOworCisgICAgaWYgKCFyZXNvdXJjZUVycm9yLmxv Y2FsaXplZERlc2NyaXB0aW9uKCkuaXNFbXB0eSgpKQorICAgICAgICBbdXNlckluZm8uZ2V0KCkg c2V0VmFsdWU6cmVzb3VyY2VFcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbigpIGZvcktleTpOU0xv Y2FsaXplZERlc2NyaXB0aW9uS2V5XTsKKworICAgIGlmICghcmVzb3VyY2VFcnJvci5mYWlsaW5n VVJMKCkuaXNFbXB0eSgpKSB7CisgICAgICAgIFJldGFpblB0cjxOU1VSTD4gY29jb2FVUkwgPSBh ZG9wdE5TKFtbTlNVUkwgYWxsb2NdIGluaXRXaXRoU3RyaW5nOnJlc291cmNlRXJyb3IuZmFpbGlu Z1VSTCgpXSk7CisgICAgICAgIFt1c2VySW5mby5nZXQoKSBzZXRWYWx1ZTpyZXNvdXJjZUVycm9y LmZhaWxpbmdVUkwoKSBmb3JLZXk6QCJOU0Vycm9yRmFpbGluZ1VSTFN0cmluZ0tleSJdOworICAg ICAgICBbdXNlckluZm8uZ2V0KCkgc2V0VmFsdWU6Y29jb2FVUkwuZ2V0KCkgZm9yS2V5OkAiTlNF cnJvckZhaWxpbmdVUkxLZXkiXTsKKyAgICB9CisKKyAgICByZXR1cm4gUmV0YWluUHRyPE5TRXJy b3I+KEFkb3B0TlMsIFtbTlNFcnJvciBhbGxvY10gaW5pdFdpdGhEb21haW46cmVzb3VyY2VFcnJv ci5kb21haW4oKSBjb2RlOnJlc291cmNlRXJyb3IuZXJyb3JDb2RlKCkgdXNlckluZm86dXNlcklu Zm8uZ2V0KCldKTsKK30KKwogI2lmIFVTRShDRk5FVFdPUkspCiAKIFJlc291cmNlRXJyb3I6OlJl c291cmNlRXJyb3IoTlNFcnJvciAqZXJyb3IpCkBAIC01MiwxMSArNjgsMTggQEAgTlNFcnJvciAq UmVzb3VyY2VFcnJvcjo6bnNFcnJvcigpIGNvbnN0CiAgICAgICAgIEFTU0VSVCghbV9wbGF0Zm9y bUVycm9yKTsKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICB9Ci0gICAgaWYgKCFtX3BsYXRmb3Jt TlNFcnJvcikgeworCisgICAgaWYgKG1fcGxhdGZvcm1OU0Vycm9yKQorICAgICAgICByZXR1cm4g bV9wbGF0Zm9ybU5TRXJyb3IuZ2V0KCk7CisKKyAgICBpZiAobV9wbGF0Zm9ybUVycm9yKSB7CiAg ICAgICAgIENGRXJyb3JSZWYgZXJyb3IgPSBtX3BsYXRmb3JtRXJyb3IuZ2V0KCk7CiAgICAgICAg IFJldGFpblB0cjxOU0RpY3Rpb25hcnk+IHVzZXJJbmZvKEFkb3B0Q0YsIChOU0RpY3Rpb25hcnkg KikgQ0ZFcnJvckNvcHlVc2VySW5mbyhlcnJvcikpOwogICAgICAgICBtX3BsYXRmb3JtTlNFcnJv ci5hZG9wdE5TKFtbTlNFcnJvciBhbGxvY10gaW5pdFdpdGhEb21haW46KE5TU3RyaW5nICopQ0ZF cnJvckdldERvbWFpbihlcnJvcikgY29kZTpDRkVycm9yR2V0Q29kZShlcnJvcikgdXNlckluZm86 dXNlckluZm8uZ2V0KCldKTsKKyAgICAgICAgcmV0dXJuIG1fcGxhdGZvcm1OU0Vycm9yLmdldCgp OwogICAgIH0KKworICAgIG1fcGxhdGZvcm1OU0Vycm9yID0gY3JlYXRlTlNFcnJvckZyb21SZXNv dXJjZUVycm9yQmFzZSgqdGhpcyk7CiAgICAgcmV0dXJuIG1fcGxhdGZvcm1OU0Vycm9yLmdldCgp OwogfQogCkBAIC0xMTMsMjEgKzEzNiw5IEBAIE5TRXJyb3IgKlJlc291cmNlRXJyb3I6Om5zRXJy b3IoKSBjb25zdAogICAgICAgICBBU1NFUlQoIW1fcGxhdGZvcm1FcnJvcik7CiAgICAgICAgIHJl dHVybiBuaWw7CiAgICAgfQotICAgIAotICAgIGlmICghbV9wbGF0Zm9ybUVycm9yKSB7Ci0gICAg ICAgIFJldGFpblB0cjxOU011dGFibGVEaWN0aW9uYXJ5PiB1c2VySW5mbyhBZG9wdE5TLCBbW05T TXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRdKTsKIAotICAgICAgICBpZiAoIW1fbG9jYWxp emVkRGVzY3JpcHRpb24uaXNFbXB0eSgpKQotICAgICAgICAgICAgW3VzZXJJbmZvLmdldCgpIHNl dFZhbHVlOm1fbG9jYWxpemVkRGVzY3JpcHRpb24gZm9yS2V5Ok5TTG9jYWxpemVkRGVzY3JpcHRp b25LZXldOwotCi0gICAgICAgIGlmICghbV9mYWlsaW5nVVJMLmlzRW1wdHkoKSkgewotICAgICAg ICAgICAgUmV0YWluUHRyPE5TVVJMPiBjb2NvYVVSTCA9IGFkb3B0TlMoW1tOU1VSTCBhbGxvY10g aW5pdFdpdGhTdHJpbmc6bV9mYWlsaW5nVVJMXSk7Ci0gICAgICAgICAgICBbdXNlckluZm8uZ2V0 KCkgc2V0VmFsdWU6bV9mYWlsaW5nVVJMIGZvcktleTpAIk5TRXJyb3JGYWlsaW5nVVJMU3RyaW5n S2V5Il07Ci0gICAgICAgICAgICBbdXNlckluZm8uZ2V0KCkgc2V0VmFsdWU6Y29jb2FVUkwuZ2V0 KCkgZm9yS2V5OkAiTlNFcnJvckZhaWxpbmdVUkxLZXkiXTsKLSAgICAgICAgfQotCi0gICAgICAg IG1fcGxhdGZvcm1FcnJvci5hZG9wdE5TKFtbTlNFcnJvciBhbGxvY10gaW5pdFdpdGhEb21haW46 bV9kb21haW4gY29kZTptX2Vycm9yQ29kZSB1c2VySW5mbzp1c2VySW5mby5nZXQoKV0pOwotICAg IH0KKyAgICBpZiAoIW1fcGxhdGZvcm1FcnJvcikKKyAgICAgICAgbV9wbGF0Zm9ybUVycm9yID0g Y3JlYXRlTlNFcnJvckZyb21SZXNvdXJjZUVycm9yQmFzZSgqdGhpcyk7OwogCiAgICAgcmV0dXJu IG1fcGxhdGZvcm1FcnJvci5nZXQoKTsKIH0K