238585 2022-03-30 19:19:23 -0700 Fix null string crashes in PushService 2022-03-31 04:18:25 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 nham nham darin nham webkit-bug-importer oldest_to_newest 1856642 0 nham 2022-03-30 19:19:23 -0700 Fix null string crashes in PushService 1856647 1 456196 nham 2022-03-30 19:43:51 -0700 Created attachment 456196 Patch 1856652 2 nham 2022-03-30 20:19:06 -0700 rdar://91059699 1856766 3 ews-feeder 2022-03-31 04:18:22 -0700 Committed r292152 (249059@main): <https://commits.webkit.org/249059@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456196. 456196 2022-03-30 19:43:51 -0700 2022-03-31 04:18:24 -0700 Patch bug-238585-20220330194350.patch text/plain 5919 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVkMTJhMWYzZjAwMGRmZDY3 YzA5ODk2Y2RmY2M4YWY3MjFkZTBjZDIuLmZmOTYyNWJhODUyZDc3YjhhYmNkODNmY2MxMGQ4YmQw ZjExMTI4ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjItMDMtMzAgIEJlbiBOaGFt ICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IG51bGwgc3RyaW5nIGNyYXNoZXMgaW4g UHVzaFNlcnZpY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzODU4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdlJ3ZlIHNlZW4gYSBmZXcgd2VicHVzaGQgY3Jhc2hlcyBkdWUgdG8gc29tZSBQdXNoU2Vy dmljZSByb3V0aW5lcyBiZWluZyBwYXNzZWQgbnVsbCBzdHJpbmcKKyAgICAgICAgYXJndW1lbnRz LiBHdWFyZCBhZ2FpbnN0IHRoaXMgd2l0aCBpc0VtcHR5IGNoZWNrcy4KKworICAgICAgICBUaGlz IGFsc28gc2hvdWxkbid0IGJlIHBvc3NpYmxlLS13ZSBzaG91bGRuJ3QgYmUgc2VuZGluZyB0aGVz ZSByZXF1ZXN0cyB0byB3ZWJwdXNoZCBpbiB0aGUKKyAgICAgICAgZmlyc3QgcGxhY2UuIEFkZCBz b21lIGxvZ3MgdG8gaGVscCB1cyBjYXRjaCB3aGF0J3MgZ29pbmcgb24uCisKKyAgICAgICAgKiB3 ZWJwdXNoZC9QdXNoU2VydmljZS5tbToKKyAgICAgICAgKFdlYlB1c2hEOjpQdXNoU2VydmljZTo6 Z2V0U3Vic2NyaXB0aW9uKToKKyAgICAgICAgKFdlYlB1c2hEOjpQdXNoU2VydmljZTo6c3Vic2Ny aWJlKToKKyAgICAgICAgKFdlYlB1c2hEOjpQdXNoU2VydmljZTo6dW5zdWJzY3JpYmUpOgorICAg ICAgICAoV2ViUHVzaEQ6OlB1c2hTZXJ2aWNlOjppbmNyZW1lbnRTaWxlbnRQdXNoQ291bnQpOgor ICAgICAgICAoV2ViUHVzaEQ6OlB1c2hTZXJ2aWNlOjpyZW1vdmVSZWNvcmRzSW1wbCk6CisKIDIw MjItMDMtMzAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2Ug ZGlzcGF0Y2hfc291cmNlX2NyZWF0ZShESVNQQVRDSF9TT1VSQ0VfVFlQRV9TSUdOQUwsIFNJR1RF Uk0pIGluIHNldE9TVHJhbnNhY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93ZWJw dXNoZC9QdXNoU2VydmljZS5tbSBiL1NvdXJjZS9XZWJLaXQvd2VicHVzaGQvUHVzaFNlcnZpY2Uu bW0KaW5kZXggNGEyN2I0MzY3ZGRlZTI2NTdjODU1YTZlM2FjMjUyNzliMmRiOGVlNS4uZWVjY2Mx MmMxY2NiZDFhODQ3YTMyMmZkNjBhY2Q1MGViMzE0OGVlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC93ZWJwdXNoZC9QdXNoU2VydmljZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L3dlYnB1c2hk L1B1c2hTZXJ2aWNlLm1tCkBAIC00MzgsNiArNDM4LDEyIEBAIHZvaWQgUHVzaFNlcnZpY2U6OmZp bmlzaGVkUHVzaFNlcnZpY2VSZXF1ZXN0KFB1c2hTZXJ2aWNlUmVxdWVzdE1hcCYgbWFwLCBQdXNo U2VyCiAKIHZvaWQgUHVzaFNlcnZpY2U6OmdldFN1YnNjcmlwdGlvbihjb25zdCBTdHJpbmcmIGJ1 bmRsZUlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgc2NvcGUsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoY29uc3QgRXhwZWN0ZWQ8c3RkOjpvcHRpb25hbDxXZWJDb3JlOjpQdXNoU3Vic2NyaXB0aW9u RGF0YT4sIFdlYkNvcmU6OkV4Y2VwdGlvbkRhdGE+Jik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7 CisgICAgaWYgKGJ1bmRsZUlkZW50aWZpZXIuaXNFbXB0eSgpIHx8IHNjb3BlLmlzRW1wdHkoKSkg eworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQdXNoLCAiSWdub3JpbmcgZ2V0U3Vic2NyaXB0 aW9uIHJlcXVlc3Qgd2l0aCBidW5kbGVJZGVudGlmaWVyIChlbXB0eSA9ICVkKSBhbmQgc2NvcGUg KGVtcHR5ID0gJWQpIiwgYnVuZGxlSWRlbnRpZmllci5pc0VtcHR5KCksIHNjb3BlLmlzRW1wdHko KSk7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKG1ha2VVbmV4cGVjdGVkKFdlYkNvcmU6OkV4 Y2VwdGlvbkRhdGEgeyBXZWJDb3JlOjpBYm9ydEVycm9yLCAiSW52YWxpZCBzZW5kZXIiX3MgfSkp OworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgZW5xdWV1ZVB1c2hTZXJ2aWNlUmVxdWVz dChtX2dldFN1YnNjcmlwdGlvblJlcXVlc3RzLCBtYWtlVW5pcXVlPEdldFN1YnNjcmlwdGlvblJl cXVlc3Q+KCp0aGlzLCBidW5kbGVJZGVudGlmaWVyLCBzY29wZSwgV1RGTW92ZShjb21wbGV0aW9u SGFuZGxlcikpKTsKIH0KIApAQCAtNDQ4LDYgKzQ1NCwxMiBAQCB2b2lkIFB1c2hTZXJ2aWNlOjpk aWRDb21wbGV0ZUdldFN1YnNjcmlwdGlvblJlcXVlc3QoR2V0U3Vic2NyaXB0aW9uUmVxdWVzdCYg cmVxdQogCiB2b2lkIFB1c2hTZXJ2aWNlOjpzdWJzY3JpYmUoY29uc3QgU3RyaW5nJiBidW5kbGVJ ZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIHNjb3BlLCBjb25zdCBWZWN0b3I8dWludDhfdD4mIHZh cGlkUHVibGljS2V5LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IEV4cGVjdGVkPFdlYkNv cmU6OlB1c2hTdWJzY3JpcHRpb25EYXRhLCBXZWJDb3JlOjpFeGNlcHRpb25EYXRhPiYpPiYmIGNv bXBsZXRpb25IYW5kbGVyKQogeworICAgIGlmIChidW5kbGVJZGVudGlmaWVyLmlzRW1wdHkoKSB8 fCBzY29wZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHVzaCwgIkln bm9yaW5nIHN1YnNjcmliZSByZXF1ZXN0IHdpdGggYnVuZGxlSWRlbnRpZmllciAoZW1wdHkgPSAl ZCkgYW5kIHNjb3BlIChlbXB0eSA9ICVkKSIsIGJ1bmRsZUlkZW50aWZpZXIuaXNFbXB0eSgpLCBz Y29wZS5pc0VtcHR5KCkpOworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihtYWtlVW5leHBlY3Rl ZChXZWJDb3JlOjpFeGNlcHRpb25EYXRhIHsgV2ViQ29yZTo6QWJvcnRFcnJvciwgIkludmFsaWQg c2VuZGVyIl9zIH0pKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGVucXVldWVQdXNo U2VydmljZVJlcXVlc3QobV9zdWJzY3JpYmVSZXF1ZXN0cywgbWFrZVVuaXF1ZTxTdWJzY3JpYmVS ZXF1ZXN0PigqdGhpcywgYnVuZGxlSWRlbnRpZmllciwgc2NvcGUsIHZhcGlkUHVibGljS2V5LCBX VEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSkpOwogfQogCkBAIC00NTgsNiArNDcwLDEyIEBAIHZv aWQgUHVzaFNlcnZpY2U6OmRpZENvbXBsZXRlU3Vic2NyaWJlUmVxdWVzdChTdWJzY3JpYmVSZXF1 ZXN0JiByZXF1ZXN0KQogCiB2b2lkIFB1c2hTZXJ2aWNlOjp1bnN1YnNjcmliZShjb25zdCBTdHJp bmcmIGJ1bmRsZUlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgc2NvcGUsIHN0ZDo6b3B0aW9uYWw8 UHVzaFN1YnNjcmlwdGlvbklkZW50aWZpZXI+IHN1YnNjcmlwdGlvbklkZW50aWZpZXIsIENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgRXhwZWN0ZWQ8Ym9vbCwgV2ViQ29yZTo6RXhjZXB0aW9u RGF0YT4mKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBpZiAoYnVuZGxlSWRlbnRpZmll ci5pc0VtcHR5KCkgfHwgc2NvcGUuaXNFbXB0eSgpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0VS Uk9SKFB1c2gsICJJZ25vcmluZyB1bnN1YnNjcmliZSByZXF1ZXN0IHdpdGggYnVuZGxlSWRlbnRp ZmllciAoZW1wdHkgPSAlZCkgYW5kIHNjb3BlIChlbXB0eSA9ICVkKSIsIGJ1bmRsZUlkZW50aWZp ZXIuaXNFbXB0eSgpLCBzY29wZS5pc0VtcHR5KCkpOworICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihtYWtlVW5leHBlY3RlZChXZWJDb3JlOjpFeGNlcHRpb25EYXRhIHsgV2ViQ29yZTo6QWJvcnRF cnJvciwgIkludmFsaWQgc2VuZGVyIl9zIH0pKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwog ICAgIGVucXVldWVQdXNoU2VydmljZVJlcXVlc3QobV91bnN1YnNjcmliZVJlcXVlc3RzLCBtYWtl VW5pcXVlPFVuc3Vic2NyaWJlUmVxdWVzdD4oKnRoaXMsIGJ1bmRsZUlkZW50aWZpZXIsIHNjb3Bl LCBzdWJzY3JpcHRpb25JZGVudGlmaWVyLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSkpOwog fQogCkBAIC00NjgsNiArNDg2LDEyIEBAIHZvaWQgUHVzaFNlcnZpY2U6OmRpZENvbXBsZXRlVW5z dWJzY3JpYmVSZXF1ZXN0KFVuc3Vic2NyaWJlUmVxdWVzdCYgcmVxdWVzdCkKIAogdm9pZCBQdXNo U2VydmljZTo6aW5jcmVtZW50U2lsZW50UHVzaENvdW50KGNvbnN0IFN0cmluZyYgYnVuZGxlSWRl bnRpZmllciwgY29uc3QgU3RyaW5nJiBzZWN1cml0eU9yaWdpbiwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZCh1bnNpZ25lZCk+JiYgaGFuZGxlcikKIHsKKyAgICBpZiAoYnVuZGxlSWRlbnRpZmllci5p c0VtcHR5KCkgfHwgc2VjdXJpdHlPcmlnaW4uaXNFbXB0eSgpKSB7CisgICAgICAgIFJFTEVBU0Vf TE9HX0VSUk9SKFB1c2gsICJJZ25vcmluZyByZW1vdmVSZWNvcmRzSW1wbCByZXF1ZXN0IHdpdGgg YnVuZGxlSWRlbnRpZmllciAoZW1wdHkgPSAlZCkgYW5kIHNlY3VyaXR5T3JpZ2luIChlbXB0eSA9 ICVkKSIsIGJ1bmRsZUlkZW50aWZpZXIuaXNFbXB0eSgpLCBzZWN1cml0eU9yaWdpbi5pc0VtcHR5 KCkpOworICAgICAgICBoYW5kbGVyKDApOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAg bV9kYXRhYmFzZS0+aW5jcmVtZW50U2lsZW50UHVzaENvdW50KGJ1bmRsZUlkZW50aWZpZXIsIHNl Y3VyaXR5T3JpZ2luLCBbdGhpcywgYnVuZGxlSWRlbnRpZmllciwgc2VjdXJpdHlPcmlnaW4sIGhh bmRsZXIgPSBXVEZNb3ZlKGhhbmRsZXIpXSh1bnNpZ25lZCBzaWxlbnRQdXNoQ291bnQpIG11dGFi bGUgewogICAgICAgICBpZiAoc2lsZW50UHVzaENvdW50IDwgV2ViS2l0OjpXZWJQdXNoRDo6bWF4 U2lsZW50UHVzaENvdW50KSB7CiAgICAgICAgICAgICBoYW5kbGVyKHNpbGVudFB1c2hDb3VudCk7 CkBAIC00OTQsNiArNTE4LDEyIEBAIHZvaWQgUHVzaFNlcnZpY2U6OnJlbW92ZVJlY29yZHNGb3JC dW5kbGVJZGVudGlmaWVyQW5kT3JpZ2luKGNvbnN0IFN0cmluZyYgYnVuZGxlCiAKIHZvaWQgUHVz aFNlcnZpY2U6OnJlbW92ZVJlY29yZHNJbXBsKGNvbnN0IFN0cmluZyYgYnVuZGxlSWRlbnRpZmll ciwgY29uc3Qgc3RkOjpvcHRpb25hbDxTdHJpbmc+JiBzZWN1cml0eU9yaWdpbiwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZCh1bnNpZ25lZCk+JiYgaGFuZGxlcikKIHsKKyAgICBpZiAoYnVuZGxlSWRl bnRpZmllci5pc0VtcHR5KCkgfHwgKHNlY3VyaXR5T3JpZ2luICYmIHNlY3VyaXR5T3JpZ2luLT5p c0VtcHR5KCkpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFB1c2gsICJJZ25vcmluZyBy ZW1vdmVSZWNvcmRzSW1wbCByZXF1ZXN0IHdpdGggYnVuZGxlSWRlbnRpZmllciAoZW1wdHkgPSAl ZCkgYW5kIHNlY3VyaXR5T3JpZ2luIChlbXB0eSA9ICVkKSIsIGJ1bmRsZUlkZW50aWZpZXIuaXNF bXB0eSgpLCBzZWN1cml0eU9yaWdpbiAmJiBzZWN1cml0eU9yaWdpbi0+aXNFbXB0eSgpKTsKKyAg ICAgICAgaGFuZGxlcigwKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGF1dG8gcmVt b3ZlZFJlY29yZHNIYW5kbGVyID0gW3RoaXMsIGJ1bmRsZUlkZW50aWZpZXIsIHNlY3VyaXR5T3Jp Z2luLCBoYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKV0oVmVjdG9yPFJlbW92ZWRQdXNoUmVjb3Jk PiYmIHJlbW92ZWRSZWNvcmRzKSBtdXRhYmxlIHsKICAgICAgICAgZm9yIChhdXRvJiByZWNvcmQg OiByZW1vdmVkUmVjb3JkcykgewogICAgICAgICAgICAgbV9jb25uZWN0aW9uLT51bnN1YnNjcmli ZShyZWNvcmQudG9waWMsIHJlY29yZC5zZXJ2ZXJWQVBJRFB1YmxpY0tleSwgW3RvcGljID0gcmVj b3JkLnRvcGljXShib29sIHVuc3Vic2NyaWJlZCwgTlNFcnJvciogZXJyb3IpIHsK