179777 2017-11-16 09:29:16 -0800 Clean up KeyframeEffect 2017-11-16 12:39:47 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=179707 InRadar P2 Normal --- 1 graouts graouts buildbot cdumez cmarcelo commit-queue dbates esprehn+autocc kangil.han webkit-bug-importer oldest_to_newest 1372646 0 graouts 2017-11-16 09:29:16 -0800 Clean up KeyframeEffect 1372651 1 327069 graouts 2017-11-16 09:31:49 -0800 Created attachment 327069 Patch 1372664 2 327069 dbates 2017-11-16 09:46:03 -0800 Comment on attachment 327069 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327069&action=review > Source/WebCore/animation/KeyframeEffect.cpp:111 > + Vector<CSSPropertyID> properties(numberOfCSSProperties); > for (unsigned k = 0; k < numberOfCSSProperties; ++k) { > - properties.append(styleProperties->propertyAt(k).id()); > + properties.uncheckedAppend(styleProperties->propertyAt(k).id()); This is not correct. This will allocate numberOfCSSProperties CSSPropertyID default constructed objects; => we are both allocating capacity and changing the size of the Vector. Then we are using unchecked append to append new elements outside the bounds of the Vector. If we allocate up-front then we should be modifying the existing elements in the Vector. That is, we should not using uncheckedAppend. Alternatively, we should use Vector::reserveInitialCapacity() and Vector::uncheckedAppend() to allocate the underlying buffer without object construction and then safely construct new objects in the first free position in the buffer (increasing the size of the Vector). 1372673 3 327072 graouts 2017-11-16 09:57:49 -0800 Created attachment 327072 Patch for landing 1372675 4 327072 dbates 2017-11-16 10:02:26 -0800 Comment on attachment 327072 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=327072&action=review > Source/WebCore/animation/KeyframeEffect.cpp:111 > + properties[k] = WTFMove(styleProperties->propertyAt(k).id()); This is bad programming practice. We should not be moving this value as we are using it below. In practice, this code will work because CSSPropertyID is a POD type and is always copied. 1372676 5 327074 graouts 2017-11-16 10:04:57 -0800 Created attachment 327074 Patch for landing 1372764 6 327074 commit-queue 2017-11-16 12:38:28 -0800 Comment on attachment 327074 Patch for landing Clearing flags on attachment: 327074 Committed r224934: <https://trac.webkit.org/changeset/224934> 1372765 7 commit-queue 2017-11-16 12:38:30 -0800 All reviewed patches have been landed. Closing bug. 1372766 8 webkit-bug-importer 2017-11-16 12:39:47 -0800 <rdar://problem/35595728> 327069 2017-11-16 09:31:49 -0800 2017-11-16 09:57:47 -0800 Patch bug-179777-20171116093149.patch text/plain 4553 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0ODk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWI3ZTA1YjBlNzdiMzU2 MDZmNTE4MTViNmMwZjA4Y2JlMDU2ODY1OS4uNTM1ODdjMDg0NjU5Njk0MzYwODdlNTc5NGVmNzk3 N2QyZmZjZDY1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTExLTE2ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgS2V5ZnJh bWVFZmZlY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE3OTc3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEEgZmV3IHJldmlldyBjb21tZW50cyBjYW1lIGluIGFmdGVyIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk3MDcgbGFuZGVkLAorICAgICAgICBhZGRyZXNzaW5nIHRo ZW0gd2l0aCB0aGlzIGZvbGxvdy11cCBwYXRjaC4KKworICAgICAgICAqIGFuaW1hdGlvbi9LZXlm cmFtZUVmZmVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUVmZmVjdDo6Y3JlYXRl KTogVXNlICJrZXlmcmFtZUVmZmVjdCIgaW5zdGVhZCBvZiAicmVzdWx0IiBmb3IgY2xhcml0eS4K KyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lRWZmZWN0Ojpwcm9jZXNzS2V5ZnJhbWVzKTogVXNl IGNvbnNpc3RlbnQgaW5kZXggYW5kIGxlbmd0aCB0eXBlcyB3aGlsZSBpdGVyYXRpbmcKKyAgICAg ICAgb3ZlciBwcm9wZXJ0aWVzIGluIFByb3BlcnR5TmFtZUFycmF5IGFuZCBleHBsaWNpdGx5IHNp emUgdGhlIHByb3BlcnRpZXMgYXJyYXkgc2luY2Ugd2UgYWxyZWFkeQorICAgICAgICBrbm93IGl0 cyBmaW5hbCBzaXplLgorICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkVsZW1lbnQ6OmdldEFuaW1hdGlvbnMpOgorCiAyMDE3LTExLTE1ICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgQVggdHJpZ2dlcnMgc3luYyBsYXlvdXQgd2hp bGUgYnVpbGRpbmcgdGhlIHJlbmRlciB0cmVlIG9uIHd3dy5tYWNydW1vcnMuY29tLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAKaW5kZXggMTU1MTNiNmUwZmZm ZmRjNWNkZjc3MmVhZjY0ODg3YzE3NGVkYTY1ZC4uMjM1ZjY3MjdiZjQzNGU3ZGMwNTFiYTI2M2Rj MGMxZjA4NDE2OGY5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZy YW1lRWZmZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZl Y3QuY3BwCkBAIC0zNywxMyArMzcsMTMgQEAgdXNpbmcgbmFtZXNwYWNlIEpTQzsKIAogRXhjZXB0 aW9uT3I8UmVmPEtleWZyYW1lRWZmZWN0Pj4gS2V5ZnJhbWVFZmZlY3Q6OmNyZWF0ZShFeGVjU3Rh dGUmIHN0YXRlLCBFbGVtZW50KiB0YXJnZXQsIFN0cm9uZzxKU09iamVjdD4mJiBrZXlmcmFtZXMp CiB7Ci0gICAgYXV0byByZXN1bHQgPSBhZG9wdFJlZigqbmV3IEtleWZyYW1lRWZmZWN0KHRhcmdl dCkpOworICAgIGF1dG8ga2V5ZnJhbWVFZmZlY3QgPSBhZG9wdFJlZigqbmV3IEtleWZyYW1lRWZm ZWN0KHRhcmdldCkpOwogCi0gICAgYXV0byBzZXRLZXlmcmFtZXNSZXN1bHQgPSByZXN1bHQtPnNl dEtleWZyYW1lcyhzdGF0ZSwgV1RGTW92ZShrZXlmcmFtZXMpKTsKKyAgICBhdXRvIHNldEtleWZy YW1lc1Jlc3VsdCA9IGtleWZyYW1lRWZmZWN0LT5zZXRLZXlmcmFtZXMoc3RhdGUsIFdURk1vdmUo a2V5ZnJhbWVzKSk7CiAgICAgaWYgKHNldEtleWZyYW1lc1Jlc3VsdC5oYXNFeGNlcHRpb24oKSkK ICAgICAgICAgcmV0dXJuIHNldEtleWZyYW1lc1Jlc3VsdC5yZWxlYXNlRXhjZXB0aW9uKCk7CiAK LSAgICByZXR1cm4gV1RGTW92ZShyZXN1bHQpOworICAgIHJldHVybiBXVEZNb3ZlKGtleWZyYW1l RWZmZWN0KTsKIH0KIAogS2V5ZnJhbWVFZmZlY3Q6OktleWZyYW1lRWZmZWN0KEVsZW1lbnQqIHRh cmdldCkKQEAgLTc5LDcgKzc5LDcgQEAgRXhjZXB0aW9uT3I8dm9pZD4gS2V5ZnJhbWVFZmZlY3Q6 OnByb2Nlc3NLZXlmcmFtZXMoRXhlY1N0YXRlJiBzdGF0ZSwgU3Ryb25nPEpTT2IKICAgICBTdHls ZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyID0gbV90YXJnZXQtPnN0eWxlUmVzb2x2ZXIoKTsKICAg ICBhdXRvIHBhcnNlckNvbnRleHQgPSBDU1NQYXJzZXJDb250ZXh0KEhUTUxTdGFuZGFyZE1vZGUp OwogCi0gICAgY29uc3QgYXV0byogYXJyYXkgPSBqc0Nhc3Q8Y29uc3QgSlNBcnJheSo+KGtleWZy YW1lcy5nZXQoKSk7CisgICAgYXV0byogYXJyYXkgPSBqc0Nhc3Q8Y29uc3QgSlNBcnJheSo+KGtl eWZyYW1lcy5nZXQoKSk7CiAgICAgYXV0byBsZW5ndGggPSBhcnJheS0+bGVuZ3RoKCk7CiAgICAg aWYgKGxlbmd0aCAhPSAyKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgVHlwZUVycm9yIH07 CkBAIC05NCw3ICs5NCw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEtleWZyYW1lRWZmZWN0Ojpwcm9j ZXNzS2V5ZnJhbWVzKEV4ZWNTdGF0ZSYgc3RhdGUsIFN0cm9uZzxKU09iCiAgICAgICAgIHNpemVf dCBudW1iZXJPZlByb3BlcnRpZXMgPSBvd25Qcm9wZXJ0eU5hbWVzLnNpemUoKTsKIAogICAgICAg ICBTdHJpbmdCdWlsZGVyIGNzc1RleHQ7Ci0gICAgICAgIGZvciAodW5zaWduZWQgaiA9IDA7IGog PCBudW1iZXJPZlByb3BlcnRpZXM7ICsraikgeworICAgICAgICBmb3IgKHNpemVfdCBqID0gMDsg aiA8IG51bWJlck9mUHJvcGVydGllczsgKytqKSB7CiAgICAgICAgICAgICBjc3NUZXh0LmFwcGVu ZChvd25Qcm9wZXJ0eU5hbWVzW2pdLnN0cmluZygpKTsKICAgICAgICAgICAgIGNzc1RleHQuYXBw ZW5kTGl0ZXJhbCgiOiAiKTsKICAgICAgICAgICAgIGNzc1RleHQuYXBwZW5kKGtleWZyYW1lLT5n ZXQoJnN0YXRlLCBvd25Qcm9wZXJ0eU5hbWVzW2pdKS50b1dURlN0cmluZygmc3RhdGUpKTsKQEAg LTEwNiw5ICsxMDYsOSBAQCBFeGNlcHRpb25Pcjx2b2lkPiBLZXlmcmFtZUVmZmVjdDo6cHJvY2Vz c0tleWZyYW1lcyhFeGVjU3RhdGUmIHN0YXRlLCBTdHJvbmc8SlNPYgogICAgICAgICBzdHlsZVBy b3BlcnRpZXMtPnBhcnNlRGVjbGFyYXRpb24oY3NzVGV4dC50b1N0cmluZygpLCBwYXJzZXJDb250 ZXh0KTsKICAgICAgICAgdW5zaWduZWQgbnVtYmVyT2ZDU1NQcm9wZXJ0aWVzID0gc3R5bGVQcm9w ZXJ0aWVzLT5wcm9wZXJ0eUNvdW50KCk7CiAKLSAgICAgICAgVmVjdG9yPENTU1Byb3BlcnR5SUQ+ IHByb3BlcnRpZXM7CisgICAgICAgIFZlY3RvcjxDU1NQcm9wZXJ0eUlEPiBwcm9wZXJ0aWVzKG51 bWJlck9mQ1NTUHJvcGVydGllcyk7CiAgICAgICAgIGZvciAodW5zaWduZWQgayA9IDA7IGsgPCBu dW1iZXJPZkNTU1Byb3BlcnRpZXM7ICsraykgewotICAgICAgICAgICAgcHJvcGVydGllcy5hcHBl bmQoc3R5bGVQcm9wZXJ0aWVzLT5wcm9wZXJ0eUF0KGspLmlkKCkpOworICAgICAgICAgICAgcHJv cGVydGllcy51bmNoZWNrZWRBcHBlbmQoc3R5bGVQcm9wZXJ0aWVzLT5wcm9wZXJ0eUF0KGspLmlk KCkpOwogICAgICAgICAgICAgc3R5bGVSZXNvbHZlci5hcHBseVByb3BlcnR5VG9TdHlsZShzdHls ZVByb3BlcnRpZXMtPnByb3BlcnR5QXQoaykuaWQoKSwgc3R5bGVQcm9wZXJ0aWVzLT5wcm9wZXJ0 eUF0KGspLnZhbHVlKCksIFdURk1vdmUocmVuZGVyU3R5bGUpKTsKICAgICAgICAgICAgIHJlbmRl clN0eWxlID0gc3R5bGVSZXNvbHZlci5zdGF0ZSgpLnRha2VTdHlsZSgpOwogICAgICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5jcHAKaW5kZXggMjAwMmMzNzBlOWYwYmFlODY0NzczMjRhNTA5YjFmNDE3 YjVkZTJkZi4uOTEyNjliZGRlNzEzZDQ5MjgyYzk0MzAxZTg3M2JlMDJiYmZkYzAyMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9FbGVtZW50LmNwcApAQCAtMzcwOCw3ICszNzA4LDcgQEAgVmVjdG9yPFJlZlB0cjxXZWJB bmltYXRpb24+PiBFbGVtZW50OjpnZXRBbmltYXRpb25zKCkKICAgICAvLyBGSVhNRTogRmlsdGVy IGFuZCBvcmRlciB0aGUgbGlzdCBhcyBzcGVjaWZpZWQgKHdlYmtpdC5vcmcvYi8xNzk1MzUpLgog ICAgIGlmIChhdXRvIHRpbWVsaW5lID0gZG9jdW1lbnQoKS5leGlzdGluZ1RpbWVsaW5lKCkpCiAg ICAgICAgIHJldHVybiB0aW1lbGluZS0+YW5pbWF0aW9uc0ZvckVsZW1lbnQoKnRoaXMpOwotICAg IHJldHVybiBWZWN0b3I8UmVmUHRyPFdlYkFuaW1hdGlvbj4+IHsgfTsKKyAgICByZXR1cm4geyB9 OwogfQogCiBBY2Nlc3NpYmxlTm9kZSogRWxlbWVudDo6YWNjZXNzaWJsZU5vZGUoKQo= 327072 2017-11-16 09:57:49 -0800 2017-11-16 10:04:55 -0800 Patch for landing bug-179777-20171116095748.patch text/plain 4548 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0ODk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWI3ZTA1YjBlNzdiMzU2 MDZmNTE4MTViNmMwZjA4Y2JlMDU2ODY1OS4uMmYzNTU2MzY0OTBmODg2OGMyMmY3MGJmYmU5MDY3 MDQ2NTA3YzMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTExLTE2ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgS2V5ZnJh bWVFZmZlY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE3OTc3NworCisgICAgICAgIFJldmlld2VkIGJ5IERhbmllbCBCYXRlcy4KKworICAgICAgICBB IGZldyByZXZpZXcgY29tbWVudHMgY2FtZSBpbiBhZnRlciBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc5NzA3IGxhbmRlZCwKKyAgICAgICAgYWRkcmVzc2luZyB0aGVt IHdpdGggdGhpcyBmb2xsb3ctdXAgcGF0Y2guCisKKyAgICAgICAgKiBhbmltYXRpb24vS2V5ZnJh bWVFZmZlY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OmNyZWF0ZSk6 IFVzZSAia2V5ZnJhbWVFZmZlY3QiIGluc3RlYWQgb2YgInJlc3VsdCIgZm9yIGNsYXJpdHkuCisg ICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUVmZmVjdDo6cHJvY2Vzc0tleWZyYW1lcyk6IFVzZSBj b25zaXN0ZW50IGluZGV4IGFuZCBsZW5ndGggdHlwZXMgd2hpbGUgaXRlcmF0aW5nCisgICAgICAg IG92ZXIgcHJvcGVydGllcyBpbiBQcm9wZXJ0eU5hbWVBcnJheSBhbmQgZXhwbGljaXRseSBzaXpl IHRoZSBwcm9wZXJ0aWVzIGFycmF5IHNpbmNlIHdlIGFscmVhZHkKKyAgICAgICAga25vdyBpdHMg ZmluYWwgc2l6ZS4KKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpFbGVtZW50OjpnZXRBbmltYXRpb25zKToKKwogMjAxNy0xMS0xNSAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFYIHRyaWdnZXJzIHN5bmMgbGF5b3V0IHdoaWxl IGJ1aWxkaW5nIHRoZSByZW5kZXIgdHJlZSBvbiB3d3cubWFjcnVtb3JzLmNvbS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCmluZGV4IDE1NTEzYjZlMGZmZmZk YzVjZGY3NzJlYWY2NDg4N2MxNzRlZGE2NWQuLjMyZDY1NDRlNDVmMGEzMjEyNGY1ZjI4YjUwNDlj YmY2NDU1NmJlMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFt ZUVmZmVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0 LmNwcApAQCAtMzcsMTMgKzM3LDEzIEBAIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiAKIEV4Y2VwdGlv bk9yPFJlZjxLZXlmcmFtZUVmZmVjdD4+IEtleWZyYW1lRWZmZWN0OjpjcmVhdGUoRXhlY1N0YXRl JiBzdGF0ZSwgRWxlbWVudCogdGFyZ2V0LCBTdHJvbmc8SlNPYmplY3Q+JiYga2V5ZnJhbWVzKQog ewotICAgIGF1dG8gcmVzdWx0ID0gYWRvcHRSZWYoKm5ldyBLZXlmcmFtZUVmZmVjdCh0YXJnZXQp KTsKKyAgICBhdXRvIGtleWZyYW1lRWZmZWN0ID0gYWRvcHRSZWYoKm5ldyBLZXlmcmFtZUVmZmVj dCh0YXJnZXQpKTsKIAotICAgIGF1dG8gc2V0S2V5ZnJhbWVzUmVzdWx0ID0gcmVzdWx0LT5zZXRL ZXlmcmFtZXMoc3RhdGUsIFdURk1vdmUoa2V5ZnJhbWVzKSk7CisgICAgYXV0byBzZXRLZXlmcmFt ZXNSZXN1bHQgPSBrZXlmcmFtZUVmZmVjdC0+c2V0S2V5ZnJhbWVzKHN0YXRlLCBXVEZNb3ZlKGtl eWZyYW1lcykpOwogICAgIGlmIChzZXRLZXlmcmFtZXNSZXN1bHQuaGFzRXhjZXB0aW9uKCkpCiAg ICAgICAgIHJldHVybiBzZXRLZXlmcmFtZXNSZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpOwogCi0g ICAgcmV0dXJuIFdURk1vdmUocmVzdWx0KTsKKyAgICByZXR1cm4gV1RGTW92ZShrZXlmcmFtZUVm ZmVjdCk7CiB9CiAKIEtleWZyYW1lRWZmZWN0OjpLZXlmcmFtZUVmZmVjdChFbGVtZW50KiB0YXJn ZXQpCkBAIC03OSw3ICs3OSw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEtleWZyYW1lRWZmZWN0Ojpw cm9jZXNzS2V5ZnJhbWVzKEV4ZWNTdGF0ZSYgc3RhdGUsIFN0cm9uZzxKU09iCiAgICAgU3R5bGVS ZXNvbHZlciYgc3R5bGVSZXNvbHZlciA9IG1fdGFyZ2V0LT5zdHlsZVJlc29sdmVyKCk7CiAgICAg YXV0byBwYXJzZXJDb250ZXh0ID0gQ1NTUGFyc2VyQ29udGV4dChIVE1MU3RhbmRhcmRNb2RlKTsK IAotICAgIGNvbnN0IGF1dG8qIGFycmF5ID0ganNDYXN0PGNvbnN0IEpTQXJyYXkqPihrZXlmcmFt ZXMuZ2V0KCkpOworICAgIGF1dG8qIGFycmF5ID0ganNDYXN0PGNvbnN0IEpTQXJyYXkqPihrZXlm cmFtZXMuZ2V0KCkpOwogICAgIGF1dG8gbGVuZ3RoID0gYXJyYXktPmxlbmd0aCgpOwogICAgIGlm IChsZW5ndGggIT0gMikKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFR5cGVFcnJvciB9OwpA QCAtOTQsNyArOTQsNyBAQCBFeGNlcHRpb25Pcjx2b2lkPiBLZXlmcmFtZUVmZmVjdDo6cHJvY2Vz c0tleWZyYW1lcyhFeGVjU3RhdGUmIHN0YXRlLCBTdHJvbmc8SlNPYgogICAgICAgICBzaXplX3Qg bnVtYmVyT2ZQcm9wZXJ0aWVzID0gb3duUHJvcGVydHlOYW1lcy5zaXplKCk7CiAKICAgICAgICAg U3RyaW5nQnVpbGRlciBjc3NUZXh0OwotICAgICAgICBmb3IgKHVuc2lnbmVkIGogPSAwOyBqIDwg bnVtYmVyT2ZQcm9wZXJ0aWVzOyArK2opIHsKKyAgICAgICAgZm9yIChzaXplX3QgaiA9IDA7IGog PCBudW1iZXJPZlByb3BlcnRpZXM7ICsraikgewogICAgICAgICAgICAgY3NzVGV4dC5hcHBlbmQo b3duUHJvcGVydHlOYW1lc1tqXS5zdHJpbmcoKSk7CiAgICAgICAgICAgICBjc3NUZXh0LmFwcGVu ZExpdGVyYWwoIjogIik7CiAgICAgICAgICAgICBjc3NUZXh0LmFwcGVuZChrZXlmcmFtZS0+Z2V0 KCZzdGF0ZSwgb3duUHJvcGVydHlOYW1lc1tqXSkudG9XVEZTdHJpbmcoJnN0YXRlKSk7CkBAIC0x MDYsOSArMTA2LDkgQEAgRXhjZXB0aW9uT3I8dm9pZD4gS2V5ZnJhbWVFZmZlY3Q6OnByb2Nlc3NL ZXlmcmFtZXMoRXhlY1N0YXRlJiBzdGF0ZSwgU3Ryb25nPEpTT2IKICAgICAgICAgc3R5bGVQcm9w ZXJ0aWVzLT5wYXJzZURlY2xhcmF0aW9uKGNzc1RleHQudG9TdHJpbmcoKSwgcGFyc2VyQ29udGV4 dCk7CiAgICAgICAgIHVuc2lnbmVkIG51bWJlck9mQ1NTUHJvcGVydGllcyA9IHN0eWxlUHJvcGVy dGllcy0+cHJvcGVydHlDb3VudCgpOwogCi0gICAgICAgIFZlY3RvcjxDU1NQcm9wZXJ0eUlEPiBw cm9wZXJ0aWVzOworICAgICAgICBWZWN0b3I8Q1NTUHJvcGVydHlJRD4gcHJvcGVydGllcyhudW1i ZXJPZkNTU1Byb3BlcnRpZXMpOwogICAgICAgICBmb3IgKHVuc2lnbmVkIGsgPSAwOyBrIDwgbnVt YmVyT2ZDU1NQcm9wZXJ0aWVzOyArK2spIHsKLSAgICAgICAgICAgIHByb3BlcnRpZXMuYXBwZW5k KHN0eWxlUHJvcGVydGllcy0+cHJvcGVydHlBdChrKS5pZCgpKTsKKyAgICAgICAgICAgIHByb3Bl cnRpZXNba10gPSBXVEZNb3ZlKHN0eWxlUHJvcGVydGllcy0+cHJvcGVydHlBdChrKS5pZCgpKTsK ICAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXIuYXBwbHlQcm9wZXJ0eVRvU3R5bGUoc3R5bGVQcm9w ZXJ0aWVzLT5wcm9wZXJ0eUF0KGspLmlkKCksIHN0eWxlUHJvcGVydGllcy0+cHJvcGVydHlBdChr KS52YWx1ZSgpLCBXVEZNb3ZlKHJlbmRlclN0eWxlKSk7CiAgICAgICAgICAgICByZW5kZXJTdHls ZSA9IHN0eWxlUmVzb2x2ZXIuc3RhdGUoKS50YWtlU3R5bGUoKTsKICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwCmluZGV4IDIwMDJjMzcwZTlmMGJhZTg2NDc3MzI0YTUwOWIxZjQxN2I1ZGUy ZGYuLjkxMjY5YmRkZTcxM2Q0OTI4MmM5NDMwMWU4NzNiZTAyYmJmZGMwMjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5jcHAKQEAgLTM3MDgsNyArMzcwOCw3IEBAIFZlY3RvcjxSZWZQdHI8V2ViQW5pbWF0 aW9uPj4gRWxlbWVudDo6Z2V0QW5pbWF0aW9ucygpCiAgICAgLy8gRklYTUU6IEZpbHRlciBhbmQg b3JkZXIgdGhlIGxpc3QgYXMgc3BlY2lmaWVkICh3ZWJraXQub3JnL2IvMTc5NTM1KS4KICAgICBp ZiAoYXV0byB0aW1lbGluZSA9IGRvY3VtZW50KCkuZXhpc3RpbmdUaW1lbGluZSgpKQogICAgICAg ICByZXR1cm4gdGltZWxpbmUtPmFuaW1hdGlvbnNGb3JFbGVtZW50KCp0aGlzKTsKLSAgICByZXR1 cm4gVmVjdG9yPFJlZlB0cjxXZWJBbmltYXRpb24+PiB7IH07CisgICAgcmV0dXJuIHsgfTsKIH0K IAogQWNjZXNzaWJsZU5vZGUqIEVsZW1lbnQ6OmFjY2Vzc2libGVOb2RlKCkK 327074 2017-11-16 10:04:57 -0800 2017-11-16 12:38:28 -0800 Patch for landing bug-179777-20171116100456.patch text/plain 4539 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0ODk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWI3ZTA1YjBlNzdiMzU2 MDZmNTE4MTViNmMwZjA4Y2JlMDU2ODY1OS4uMmYzNTU2MzY0OTBmODg2OGMyMmY3MGJmYmU5MDY3 MDQ2NTA3YzMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTExLTE2ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgS2V5ZnJh bWVFZmZlY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE3OTc3NworCisgICAgICAgIFJldmlld2VkIGJ5IERhbmllbCBCYXRlcy4KKworICAgICAgICBB IGZldyByZXZpZXcgY29tbWVudHMgY2FtZSBpbiBhZnRlciBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc5NzA3IGxhbmRlZCwKKyAgICAgICAgYWRkcmVzc2luZyB0aGVt IHdpdGggdGhpcyBmb2xsb3ctdXAgcGF0Y2guCisKKyAgICAgICAgKiBhbmltYXRpb24vS2V5ZnJh bWVFZmZlY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVFZmZlY3Q6OmNyZWF0ZSk6 IFVzZSAia2V5ZnJhbWVFZmZlY3QiIGluc3RlYWQgb2YgInJlc3VsdCIgZm9yIGNsYXJpdHkuCisg ICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUVmZmVjdDo6cHJvY2Vzc0tleWZyYW1lcyk6IFVzZSBj b25zaXN0ZW50IGluZGV4IGFuZCBsZW5ndGggdHlwZXMgd2hpbGUgaXRlcmF0aW5nCisgICAgICAg IG92ZXIgcHJvcGVydGllcyBpbiBQcm9wZXJ0eU5hbWVBcnJheSBhbmQgZXhwbGljaXRseSBzaXpl IHRoZSBwcm9wZXJ0aWVzIGFycmF5IHNpbmNlIHdlIGFscmVhZHkKKyAgICAgICAga25vdyBpdHMg ZmluYWwgc2l6ZS4KKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpFbGVtZW50OjpnZXRBbmltYXRpb25zKToKKwogMjAxNy0xMS0xNSAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFYIHRyaWdnZXJzIHN5bmMgbGF5b3V0IHdoaWxl IGJ1aWxkaW5nIHRoZSByZW5kZXIgdHJlZSBvbiB3d3cubWFjcnVtb3JzLmNvbS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCmluZGV4IDE1NTEzYjZlMGZmZmZk YzVjZGY3NzJlYWY2NDg4N2MxNzRlZGE2NWQuLjNiZTVmYjQzYTViYjdiMGMyYjkwNGUwYmIzMmY2 Yzk3ZmFkY2M5MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFt ZUVmZmVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0 LmNwcApAQCAtMzcsMTMgKzM3LDEzIEBAIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiAKIEV4Y2VwdGlv bk9yPFJlZjxLZXlmcmFtZUVmZmVjdD4+IEtleWZyYW1lRWZmZWN0OjpjcmVhdGUoRXhlY1N0YXRl JiBzdGF0ZSwgRWxlbWVudCogdGFyZ2V0LCBTdHJvbmc8SlNPYmplY3Q+JiYga2V5ZnJhbWVzKQog ewotICAgIGF1dG8gcmVzdWx0ID0gYWRvcHRSZWYoKm5ldyBLZXlmcmFtZUVmZmVjdCh0YXJnZXQp KTsKKyAgICBhdXRvIGtleWZyYW1lRWZmZWN0ID0gYWRvcHRSZWYoKm5ldyBLZXlmcmFtZUVmZmVj dCh0YXJnZXQpKTsKIAotICAgIGF1dG8gc2V0S2V5ZnJhbWVzUmVzdWx0ID0gcmVzdWx0LT5zZXRL ZXlmcmFtZXMoc3RhdGUsIFdURk1vdmUoa2V5ZnJhbWVzKSk7CisgICAgYXV0byBzZXRLZXlmcmFt ZXNSZXN1bHQgPSBrZXlmcmFtZUVmZmVjdC0+c2V0S2V5ZnJhbWVzKHN0YXRlLCBXVEZNb3ZlKGtl eWZyYW1lcykpOwogICAgIGlmIChzZXRLZXlmcmFtZXNSZXN1bHQuaGFzRXhjZXB0aW9uKCkpCiAg ICAgICAgIHJldHVybiBzZXRLZXlmcmFtZXNSZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpOwogCi0g ICAgcmV0dXJuIFdURk1vdmUocmVzdWx0KTsKKyAgICByZXR1cm4gV1RGTW92ZShrZXlmcmFtZUVm ZmVjdCk7CiB9CiAKIEtleWZyYW1lRWZmZWN0OjpLZXlmcmFtZUVmZmVjdChFbGVtZW50KiB0YXJn ZXQpCkBAIC03OSw3ICs3OSw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IEtleWZyYW1lRWZmZWN0Ojpw cm9jZXNzS2V5ZnJhbWVzKEV4ZWNTdGF0ZSYgc3RhdGUsIFN0cm9uZzxKU09iCiAgICAgU3R5bGVS ZXNvbHZlciYgc3R5bGVSZXNvbHZlciA9IG1fdGFyZ2V0LT5zdHlsZVJlc29sdmVyKCk7CiAgICAg YXV0byBwYXJzZXJDb250ZXh0ID0gQ1NTUGFyc2VyQ29udGV4dChIVE1MU3RhbmRhcmRNb2RlKTsK IAotICAgIGNvbnN0IGF1dG8qIGFycmF5ID0ganNDYXN0PGNvbnN0IEpTQXJyYXkqPihrZXlmcmFt ZXMuZ2V0KCkpOworICAgIGF1dG8qIGFycmF5ID0ganNDYXN0PGNvbnN0IEpTQXJyYXkqPihrZXlm cmFtZXMuZ2V0KCkpOwogICAgIGF1dG8gbGVuZ3RoID0gYXJyYXktPmxlbmd0aCgpOwogICAgIGlm IChsZW5ndGggIT0gMikKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFR5cGVFcnJvciB9OwpA QCAtOTQsNyArOTQsNyBAQCBFeGNlcHRpb25Pcjx2b2lkPiBLZXlmcmFtZUVmZmVjdDo6cHJvY2Vz c0tleWZyYW1lcyhFeGVjU3RhdGUmIHN0YXRlLCBTdHJvbmc8SlNPYgogICAgICAgICBzaXplX3Qg bnVtYmVyT2ZQcm9wZXJ0aWVzID0gb3duUHJvcGVydHlOYW1lcy5zaXplKCk7CiAKICAgICAgICAg U3RyaW5nQnVpbGRlciBjc3NUZXh0OwotICAgICAgICBmb3IgKHVuc2lnbmVkIGogPSAwOyBqIDwg bnVtYmVyT2ZQcm9wZXJ0aWVzOyArK2opIHsKKyAgICAgICAgZm9yIChzaXplX3QgaiA9IDA7IGog PCBudW1iZXJPZlByb3BlcnRpZXM7ICsraikgewogICAgICAgICAgICAgY3NzVGV4dC5hcHBlbmQo b3duUHJvcGVydHlOYW1lc1tqXS5zdHJpbmcoKSk7CiAgICAgICAgICAgICBjc3NUZXh0LmFwcGVu ZExpdGVyYWwoIjogIik7CiAgICAgICAgICAgICBjc3NUZXh0LmFwcGVuZChrZXlmcmFtZS0+Z2V0 KCZzdGF0ZSwgb3duUHJvcGVydHlOYW1lc1tqXSkudG9XVEZTdHJpbmcoJnN0YXRlKSk7CkBAIC0x MDYsOSArMTA2LDkgQEAgRXhjZXB0aW9uT3I8dm9pZD4gS2V5ZnJhbWVFZmZlY3Q6OnByb2Nlc3NL ZXlmcmFtZXMoRXhlY1N0YXRlJiBzdGF0ZSwgU3Ryb25nPEpTT2IKICAgICAgICAgc3R5bGVQcm9w ZXJ0aWVzLT5wYXJzZURlY2xhcmF0aW9uKGNzc1RleHQudG9TdHJpbmcoKSwgcGFyc2VyQ29udGV4 dCk7CiAgICAgICAgIHVuc2lnbmVkIG51bWJlck9mQ1NTUHJvcGVydGllcyA9IHN0eWxlUHJvcGVy dGllcy0+cHJvcGVydHlDb3VudCgpOwogCi0gICAgICAgIFZlY3RvcjxDU1NQcm9wZXJ0eUlEPiBw cm9wZXJ0aWVzOworICAgICAgICBWZWN0b3I8Q1NTUHJvcGVydHlJRD4gcHJvcGVydGllcyhudW1i ZXJPZkNTU1Byb3BlcnRpZXMpOwogICAgICAgICBmb3IgKHVuc2lnbmVkIGsgPSAwOyBrIDwgbnVt YmVyT2ZDU1NQcm9wZXJ0aWVzOyArK2spIHsKLSAgICAgICAgICAgIHByb3BlcnRpZXMuYXBwZW5k KHN0eWxlUHJvcGVydGllcy0+cHJvcGVydHlBdChrKS5pZCgpKTsKKyAgICAgICAgICAgIHByb3Bl cnRpZXNba10gPSBzdHlsZVByb3BlcnRpZXMtPnByb3BlcnR5QXQoaykuaWQoKTsKICAgICAgICAg ICAgIHN0eWxlUmVzb2x2ZXIuYXBwbHlQcm9wZXJ0eVRvU3R5bGUoc3R5bGVQcm9wZXJ0aWVzLT5w cm9wZXJ0eUF0KGspLmlkKCksIHN0eWxlUHJvcGVydGllcy0+cHJvcGVydHlBdChrKS52YWx1ZSgp LCBXVEZNb3ZlKHJlbmRlclN0eWxlKSk7CiAgICAgICAgICAgICByZW5kZXJTdHlsZSA9IHN0eWxl UmVzb2x2ZXIuc3RhdGUoKS50YWtlU3R5bGUoKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwCmluZGV4IDIwMDJjMzcwZTlmMGJhZTg2NDc3MzI0YTUwOWIxZjQxN2I1ZGUyZGYuLjkxMjY5 YmRkZTcxM2Q0OTI4MmM5NDMwMWU4NzNiZTAyYmJmZGMwMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5j cHAKQEAgLTM3MDgsNyArMzcwOCw3IEBAIFZlY3RvcjxSZWZQdHI8V2ViQW5pbWF0aW9uPj4gRWxl bWVudDo6Z2V0QW5pbWF0aW9ucygpCiAgICAgLy8gRklYTUU6IEZpbHRlciBhbmQgb3JkZXIgdGhl IGxpc3QgYXMgc3BlY2lmaWVkICh3ZWJraXQub3JnL2IvMTc5NTM1KS4KICAgICBpZiAoYXV0byB0 aW1lbGluZSA9IGRvY3VtZW50KCkuZXhpc3RpbmdUaW1lbGluZSgpKQogICAgICAgICByZXR1cm4g dGltZWxpbmUtPmFuaW1hdGlvbnNGb3JFbGVtZW50KCp0aGlzKTsKLSAgICByZXR1cm4gVmVjdG9y PFJlZlB0cjxXZWJBbmltYXRpb24+PiB7IH07CisgICAgcmV0dXJuIHsgfTsKIH0KIAogQWNjZXNz aWJsZU5vZGUqIEVsZW1lbnQ6OmFjY2Vzc2libGVOb2RlKCkK