175128 2017-08-03 05:01:44 -0700 [EME] CDM constructor assigns CDMPrivate member multiple times 2017-08-03 07:43:28 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan calvaris jer.noble webkit-bug-importer oldest_to_newest 1334747 0 zan 2017-08-03 05:01:44 -0700 [EME] CDM constructor assigns CDMPrivate member multiple times 1334748 1 317114 zan 2017-08-03 05:11:02 -0700 Created attachment 317114 Patch 1334767 2 317114 calvaris 2017-08-03 07:04:40 -0700 Comment on attachment 317114 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=317114&action=review > Source/WebCore/ChangeLog:13 > + In the CDM class constructor, create the CDMPrivate object for > + the first key system we're able to determine as being supported, > + stopping iteration of the registered CDM factories at that point. > + This is done in a dedicated loop inside the constructor body, > + meaning the helper createCDMPrivateForKeySystem() function can > + be removed. I find syntax of the first sentence a bit complex to understand. 1334770 3 zan 2017-08-03 07:40:50 -0700 Committed r220203: <http://trac.webkit.org/changeset/220203> 1334771 4 webkit-bug-importer 2017-08-03 07:43:28 -0700 <rdar://problem/33699787> 317114 2017-08-03 05:11:02 -0700 2017-08-03 07:04:40 -0700 Patch bug-175128-20170803141101.patch text/plain 2614 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwMjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDdmNzA4MWIyNmJjMGZl MWIxOTUzYmEyOTJiY2EzMWJlYmI1NzYyMy4uMTVmYTRiNGU2ZWI4MmUzNzQ4MmMxOTc1MGYwYTZj NTg4MDI4YzQ1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA4LTAzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXSBDRE0gY29u c3RydWN0b3IgYXNzaWducyBDRE1Qcml2YXRlIG1lbWJlciBtdWx0aXBsZSB0aW1lcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1MTI4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gdGhlIENETSBjbGFz cyBjb25zdHJ1Y3RvciwgY3JlYXRlIHRoZSBDRE1Qcml2YXRlIG9iamVjdCBmb3IKKyAgICAgICAg dGhlIGZpcnN0IGtleSBzeXN0ZW0gd2UncmUgYWJsZSB0byBkZXRlcm1pbmUgYXMgYmVpbmcgc3Vw cG9ydGVkLAorICAgICAgICBzdG9wcGluZyBpdGVyYXRpb24gb2YgdGhlIHJlZ2lzdGVyZWQgQ0RN IGZhY3RvcmllcyBhdCB0aGF0IHBvaW50LgorICAgICAgICBUaGlzIGlzIGRvbmUgaW4gYSBkZWRp Y2F0ZWQgbG9vcCBpbnNpZGUgdGhlIGNvbnN0cnVjdG9yIGJvZHksCisgICAgICAgIG1lYW5pbmcg dGhlIGhlbHBlciBjcmVhdGVDRE1Qcml2YXRlRm9yS2V5U3lzdGVtKCkgZnVuY3Rpb24gY2FuCisg ICAgICAgIGJlIHJlbW92ZWQuCisKKyAgICAgICAgKiBNb2R1bGVzL2VuY3J5cHRlZG1lZGlhL0NE TS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDRE06OkNETSk6CisgICAgICAgIChXZWJDb3JlOjpj cmVhdGVDRE1Qcml2YXRlRm9yS2V5U3lzdGVtKTogRGVsZXRlZC4KKwogMjAxNy0wOC0wMiAgRGV2 aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog YWRkIHN0YWNrIHRyYWNlIGluZm9ybWF0aW9uIGZvciBlYWNoIFJlY29yZGluZ0FjdGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE0uY3BwIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9DRE0uY3BwCmluZGV4IGQ3MjIy N2MxYmY3NDNlZTMzMDY1MzdjNGIyYzIyZjY3MjdiMjg5YWUuLjZjZDcxMTQ0ZjYwYjQzOGYyZjM4 OWRiMDgzOWIzNmQzM2QzZWMyNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv ZW5jcnlwdGVkbWVkaWEvQ0RNLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5 cHRlZG1lZGlhL0NETS5jcHAKQEAgLTQ3LDE2ICs0Nyw2IEBAIHN0YXRpYyBWZWN0b3I8Q0RNRmFj dG9yeSo+JiBjZG1GYWN0b3JpZXMoKQogICAgIHJldHVybiBmYWN0b3JpZXM7CiB9CiAKLXN0YXRp YyBzdGQ6OnVuaXF1ZV9wdHI8Q0RNUHJpdmF0ZT4gY3JlYXRlQ0RNUHJpdmF0ZUZvcktleVN5c3Rl bShjb25zdCBTdHJpbmcmIGtleVN5c3RlbSwgQ0RNJiBjZG0pCi17Ci0gICAgZm9yIChhdXRvKiBm YWN0b3J5IDogY2RtRmFjdG9yaWVzKCkpIHsKLSAgICAgICAgaWYgKGZhY3RvcnktPnN1cHBvcnRz S2V5U3lzdGVtKGtleVN5c3RlbSkpCi0gICAgICAgICAgICByZXR1cm4gZmFjdG9yeS0+Y3JlYXRl Q0RNKGNkbSk7Ci0gICAgfQotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBu dWxscHRyOwotfQotCiB2b2lkIENETTo6cmVnaXN0ZXJDRE1GYWN0b3J5KENETUZhY3RvcnkmIGZh Y3RvcnkpCiB7CiAgICAgQVNTRVJUKCFjZG1GYWN0b3JpZXMoKS5jb250YWlucygmZmFjdG9yeSkp OwpAQCAtODYsMTQgKzc2LDE0IEBAIFJlZjxDRE0+IENETTo6Y3JlYXRlKERvY3VtZW50JiBkb2N1 bWVudCwgY29uc3QgU3RyaW5nJiBrZXlTeXN0ZW0pCiBDRE06OkNETShEb2N1bWVudCYgZG9jdW1l bnQsIGNvbnN0IFN0cmluZyYga2V5U3lzdGVtKQogICAgIDogQ29udGV4dERlc3RydWN0aW9uT2Jz ZXJ2ZXIoJmRvY3VtZW50KQogICAgICwgbV9rZXlTeXN0ZW0oa2V5U3lzdGVtKQotICAgICwgbV9w cml2YXRlKGNyZWF0ZUNETVByaXZhdGVGb3JLZXlTeXN0ZW0oa2V5U3lzdGVtLCAqdGhpcykpCiAg ICAgLCBtX3dlYWtQdHJGYWN0b3J5KHRoaXMpCiB7CiAgICAgQVNTRVJUKHN1cHBvcnRzS2V5U3lz dGVtKGtleVN5c3RlbSkpOwogICAgIGZvciAoYXV0byogZmFjdG9yeSA6IGNkbUZhY3Rvcmllcygp KSB7Ci0gICAgICAgIGlmICghZmFjdG9yeS0+c3VwcG9ydHNLZXlTeXN0ZW0oa2V5U3lzdGVtKSkK LSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBtX3ByaXZhdGUgPSBmYWN0b3J5LT5jcmVh dGVDRE0oKnRoaXMpOworICAgICAgICBpZiAoZmFjdG9yeS0+c3VwcG9ydHNLZXlTeXN0ZW0oa2V5 U3lzdGVtKSkgeworICAgICAgICAgICAgbV9wcml2YXRlID0gZmFjdG9yeS0+Y3JlYXRlQ0RNKCp0 aGlzKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgfQogfQogCg==