198539 2019-06-04 12:54:43 -0700 Fix 64-bit vs 32-bit mismatch in ISOFairPlayStreamingPsshBox.cpp 2019-06-04 17:40:43 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin achristensen commit-queue jer.noble webkit-bug-importer oldest_to_newest 1541705 0 krollin 2019-06-04 12:54:43 -0700 Both ISOFairPlayStreamingKeyAssetIdBox and ISOFairPlayStreamingKeyContextBox have Vector<> data members. The parse() members of these classes call Vector<>::resize() on these members. In both cases, the type of the parameter passed is a uint64_t. However, resize() takes a size_t. On some platforms, size_t is a 32-bit value, leading to a compile-time type mismatch error. Fix this by changing the type of the value passed to parse() into a size_t. 1541706 1 webkit-bug-importer 2019-06-04 12:54:57 -0700 <rdar://problem/51410358> 1541710 2 371322 krollin 2019-06-04 13:02:36 -0700 Created attachment 371322 Patch 1541815 3 371322 commit-queue 2019-06-04 17:40:41 -0700 Comment on attachment 371322 Patch Clearing flags on attachment: 371322 Committed r246092: <https://trac.webkit.org/changeset/246092> 1541816 4 commit-queue 2019-06-04 17:40:43 -0700 All reviewed patches have been landed. Closing bug. 371322 2019-06-04 13:02:36 -0700 2019-06-04 17:40:41 -0700 Patch bug-198539-20190604130235.patch text/plain 2419 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWFmMzZhM2Q0MGZhMTUx MjNmNjNiMTk0NDQ5YjU2ZTAyYTM4NDg2Zi4uZGMxYzUzOTAzODg2ODExYWJkMWRkMWQ5NmJjZTc4 NTg3YWEzM2Q2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA2LTA0ICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggNjQtYml0IHZzIDMy LWJpdCBtaXNtYXRjaCBpbiBJU09GYWlyUGxheVN0cmVhbWluZ1Bzc2hCb3guY3BwCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg1MzkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzUxNDEwMzU4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEJvdGggSVNPRmFpclBsYXlTdHJlYW1pbmdLZXlBc3NldElkQm94 IGFuZAorICAgICAgICBJU09GYWlyUGxheVN0cmVhbWluZ0tleUNvbnRleHRCb3ggaGF2ZSBWZWN0 b3I8PiBkYXRhIG1lbWJlcnMuIFRoZQorICAgICAgICBwYXJzZSgpIG1lbWJlcnMgb2YgdGhlc2Ug Y2xhc3NlcyBjYWxsIFZlY3Rvcjw+OjpyZXNpemUoKSBvbiB0aGVzZQorICAgICAgICBtZW1iZXJz LiBJbiBib3RoIGNhc2VzLCB0aGUgdHlwZSBvZiB0aGUgcGFyYW1ldGVyIHBhc3NlZCBpcyBhCisg ICAgICAgIHVpbnQ2NF90LiBIb3dldmVyLCByZXNpemUoKSB0YWtlcyBhIHNpemVfdC4gT24gc29t ZSBwbGF0Zm9ybXMsIHNpemVfdAorICAgICAgICBpcyBhIDMyLWJpdCB2YWx1ZSwgbGVhZGluZyB0 byBhIGNvbXBpbGUtdGltZSB0eXBlIG1pc21hdGNoIGVycm9yLiBGaXgKKyAgICAgICAgdGhpcyBi eSBjaGFuZ2luZyB0aGUgdHlwZSBvZiB0aGUgdmFsdWUgcGFzc2VkIHRvIHBhcnNlKCkgaW50byBh CisgICAgICAgIHNpemVfdC4KKworICAgICAgICBObyBuZXcgdGVzdHMgLS0gbm8gbmV3IGZ1bmN0 aW9uYWxpdHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSVNP RmFpclBsYXlTdHJlYW1pbmdQc3NoQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklTT0ZhaXJQ bGF5U3RyZWFtaW5nS2V5QXNzZXRJZEJveDo6cGFyc2UpOgorICAgICAgICAoV2ViQ29yZTo6SVNP RmFpclBsYXlTdHJlYW1pbmdLZXlDb250ZXh0Qm94OjpwYXJzZSk6CisKIDIwMTktMDYtMDMgIEtl aXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCAzMi1iaXQvNjQt Yml0IG1pc21hdGNoIGluIFBvaW50ZXJDYXB0dXJlQ29udHJvbGxlcjo6ZWxlbWVudFdhc1JlbW92 ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9JU09GYWlyUGxheVN0cmVhbWluZ1Bzc2hCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0lTT0ZhaXJQbGF5U3RyZWFtaW5nUHNzaEJveC5j cHAKaW5kZXggOWYwYmFiZDk2NmI4YTQ2NGI4ODQ3YTA2ZWY0ZmI1Y2IwOGQxNDk1Ny4uZjMzOTQ0 ZDE4NTA0MDNlOTE1MDJlMDYwM2Y1NGZiN2IyYjQ2ZTRmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0lTT0ZhaXJQbGF5U3RyZWFtaW5n UHNzaEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL0lTT0ZhaXJQbGF5U3RyZWFtaW5nUHNzaEJveC5jcHAKQEAgLTg4LDcgKzg4LDcgQEAg Ym9vbCBJU09GYWlyUGxheVN0cmVhbWluZ0tleUFzc2V0SWRCb3g6OnBhcnNlKEpTQzo6RGF0YVZp ZXcmIHZpZXcsIHVuc2lnbmVkJiBvZmYKICAgICBpZiAoIWJ1ZmZlcikKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgdWludDY0X3QgZGF0YVNpemU7CisgICAgc2l6ZV90IGRhdGFTaXplOwog ICAgIGlmICghV1RGOjpzYWZlU3ViKG1fc2l6ZSwgbG9jYWxPZmZzZXQgLSBvZmZzZXQsIGRhdGFT aXplKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCkBAIC0xMTcsNyArMTE3LDcgQEAgYm9vbCBJ U09GYWlyUGxheVN0cmVhbWluZ0tleUNvbnRleHRCb3g6OnBhcnNlKEpTQzo6RGF0YVZpZXcmIHZp ZXcsIHVuc2lnbmVkJiBvZmYKICAgICBpZiAoIWJ1ZmZlcikKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCi0gICAgdWludDY0X3QgZGF0YVNpemU7CisgICAgc2l6ZV90IGRhdGFTaXplOwogICAgIGlm ICghV1RGOjpzYWZlU3ViKG1fc2l6ZSwgbG9jYWxPZmZzZXQgLSBvZmZzZXQsIGRhdGFTaXplKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCg==