119296 2013-07-30 17:16:17 -0700 wrong static_casts in ANGLE 2013-08-01 13:19:52 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P1 Major --- 0 achristensen webkit-unassigned commit-queue dino eric.carlson glenn jer.noble kondapallykalyan oldest_to_newest 913111 0 achristensen 2013-07-30 17:16:17 -0700 When I updated ANGLE in https://bugs.webkit.org/show_bug.cgi?id=118550 I added static_casts to Intermediate.cpp, but as pointed out in https://code.google.com/p/angleproject/issues/detail?id=450 I did the wrong casts. This will cause it to return the wrong value in whatever this code does, especially with my cast to bool instead of int. I suggest this be fixed immediately. 913113 1 207789 achristensen 2013-07-30 17:19:46 -0700 Created attachment 207789 Patch 913114 2 commit-queue 2013-07-30 17:22:12 -0700 Attachment 207789 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/ThirdParty/ANGLE/ChangeLog', u'Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp', u'Source/ThirdParty/ANGLE/src/compiler/intermediate.h']" exit_code: 1 Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp:1406: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 913115 3 207790 achristensen 2013-07-30 17:24:24 -0700 Created attachment 207790 Patch 913117 4 commit-queue 2013-07-30 17:27:03 -0700 Attachment 207790 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/ThirdParty/ANGLE/ChangeLog', u'Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp', u'Source/ThirdParty/ANGLE/src/compiler/intermediate.h']" exit_code: 1 Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp:1406: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 913834 5 207790 commit-queue 2013-08-01 13:19:50 -0700 Comment on attachment 207790 Patch Clearing flags on attachment: 207790 Committed r153600: <http://trac.webkit.org/changeset/153600> 913835 6 commit-queue 2013-08-01 13:19:52 -0700 All reviewed patches have been landed. Closing bug. 207789 2013-07-30 17:19:46 -0700 2013-07-30 17:24:21 -0700 Patch bug-119296-20130730171945.patch text/plain 5595 achristensen SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzUwMikKKysrIFNv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE5IEBACisyMDEzLTA3LTMwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxl LmNvbT4KKworICAgICAgICBGaXhlZCB3cm9uZyBzdGF0aWNfY2FzdGluZyBpbiBBTkdMRSBmcm9t IHIxNTMwNjQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTkyOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHNyYy9jb21waWxlci9JbnRlcm1lZGlhdGUuY3BwOgorICAgICAgICAoVEludGVybWVkaWF0 ZTo6cHJvbW90ZUNvbnN0YW50VW5pb24pOgorICAgICAgICBNYWRlIGdldHRlcnMgdXNlIHNpemVf dCBpbnN0ZWFkIG9mIGludC4KKyAgICAgICAgKiBzcmMvY29tcGlsZXIvaW50ZXJtZWRpYXRlLmg6 CisgICAgICAgIChUSW50ZXJtQ29uc3RhbnRVbmlvbjo6Z2V0SUNvbnN0KToKKyAgICAgICAgKFRJ bnRlcm1Db25zdGFudFVuaW9uOjpnZXRGQ29uc3QpOgorICAgICAgICAoVEludGVybUNvbnN0YW50 VW5pb246OmdldEJDb25zdCk6CisgICAgICAgIFVuZGlkIGVycm9uZW91cyBzdGF0aWNfY2FzdCBj aGFuZ2UuCisKIDIwMTMtMDctMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBtYWtlIGRpc3RjaGVjay4KSW5kZXg6 IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9JbnRlcm1lZGlhdGUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9JbnRlcm1l ZGlhdGUuY3BwCShyZXZpc2lvbiAxNTM1MDIpCisrKyBTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvY29tcGlsZXIvSW50ZXJtZWRpYXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM3MSwxMyAr MTM3MSwxMyBAQCBUSW50ZXJtVHlwZWQqIFRJbnRlcm1lZGlhdGU6OnByb21vdGVDb25zCiAgICAg ICAgICAgICBjYXNlIEVidEZsb2F0OgogICAgICAgICAgICAgICAgIHN3aXRjaCAobm9kZS0+Z2V0 VHlwZSgpLmdldEJhc2ljVHlwZSgpKSB7CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgRWJ0SW50 OgotICAgICAgICAgICAgICAgICAgICAgICAgbGVmdFVuaW9uQXJyYXlbaV0uc2V0RkNvbnN0KHN0 YXRpY19jYXN0PGZsb2F0Pihub2RlLT5nZXRJQ29uc3Qoc3RhdGljX2Nhc3Q8aW50PihpKSkpKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIGxlZnRVbmlvbkFycmF5W2ldLnNldEZDb25zdChzdGF0 aWNfY2FzdDxmbG9hdD4obm9kZS0+Z2V0SUNvbnN0KGkpKSk7CiAgICAgICAgICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgICAgICAgICAgY2FzZSBFYnRCb29sOgotICAgICAgICAg ICAgICAgICAgICAgICAgbGVmdFVuaW9uQXJyYXlbaV0uc2V0RkNvbnN0KHN0YXRpY19jYXN0PGZs b2F0Pihub2RlLT5nZXRCQ29uc3Qoc3RhdGljX2Nhc3Q8Ym9vbD4oaSkpKSk7CisgICAgICAgICAg ICAgICAgICAgICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRGQ29uc3Qoc3RhdGljX2Nhc3Q8Zmxv YXQ+KG5vZGUtPmdldEJDb25zdChpKSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgRWJ0RmxvYXQ6Ci0gICAgICAgICAgICAgICAgICAg ICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRGQ29uc3Qoc3RhdGljX2Nhc3Q8ZmxvYXQ+KG5vZGUt PmdldEZDb25zdChzdGF0aWNfY2FzdDxmbG9hdD4oaSkpKSk7CisgICAgICAgICAgICAgICAgICAg ICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRGQ29uc3Qoc3RhdGljX2Nhc3Q8ZmxvYXQ+KG5vZGUt PmdldEZDb25zdChpKSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvU2luay5p bmZvLm1lc3NhZ2UoRVByZWZpeEludGVybmFsRXJyb3IsIG5vZGUtPmdldExpbmUoKSwgIkNhbm5v dCBwcm9tb3RlIik7CkBAIC0xMzg3LDEzICsxMzg3LDEzIEBAIFRJbnRlcm1UeXBlZCogVEludGVy bWVkaWF0ZTo6cHJvbW90ZUNvbnMKICAgICAgICAgICAgIGNhc2UgRWJ0SW50OgogICAgICAgICAg ICAgICAgIHN3aXRjaCAobm9kZS0+Z2V0VHlwZSgpLmdldEJhc2ljVHlwZSgpKSB7CiAgICAgICAg ICAgICAgICAgICAgIGNhc2UgRWJ0SW50OgotICAgICAgICAgICAgICAgICAgICAgICAgbGVmdFVu aW9uQXJyYXlbaV0uc2V0SUNvbnN0KHN0YXRpY19jYXN0PGludD4obm9kZS0+Z2V0SUNvbnN0KHN0 YXRpY19jYXN0PGludD4oaSkpKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBsZWZ0VW5pb25B cnJheVtpXS5zZXRJQ29uc3Qoc3RhdGljX2Nhc3Q8aW50Pihub2RlLT5nZXRJQ29uc3QoaSkpKTsK ICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICBjYXNl IEVidEJvb2w6Ci0gICAgICAgICAgICAgICAgICAgICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRJ Q29uc3Qoc3RhdGljX2Nhc3Q8aW50Pihub2RlLT5nZXRCQ29uc3Qoc3RhdGljX2Nhc3Q8Ym9vbD4o aSkpKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRJQ29u c3Qoc3RhdGljX2Nhc3Q8aW50Pihub2RlLT5nZXRCQ29uc3QoaSkpKTsKICAgICAgICAgICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICBjYXNlIEVidEZsb2F0OgotICAg ICAgICAgICAgICAgICAgICAgICAgbGVmdFVuaW9uQXJyYXlbaV0uc2V0SUNvbnN0KHN0YXRpY19j YXN0PGludD4obm9kZS0+Z2V0RkNvbnN0KHN0YXRpY19jYXN0PGZsb2F0PihpKSkpKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGxlZnRVbmlvbkFycmF5W2ldLnNldElDb25zdChzdGF0aWNfY2Fz dDxpbnQ+KG5vZGUtPmdldEZDb25zdChpKSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgICAgICAg ICBpbmZvU2luay5pbmZvLm1lc3NhZ2UoRVByZWZpeEludGVybmFsRXJyb3IsIG5vZGUtPmdldExp bmUoKSwgIkNhbm5vdCBwcm9tb3RlIik7CkBAIC0xNDAzLDEzICsxNDAzLDEzIEBAIFRJbnRlcm1U eXBlZCogVEludGVybWVkaWF0ZTo6cHJvbW90ZUNvbnMKICAgICAgICAgICAgIGNhc2UgRWJ0Qm9v bDoKICAgICAgICAgICAgICAgICBzd2l0Y2ggKG5vZGUtPmdldFR5cGUoKS5nZXRCYXNpY1R5cGUo KSkgewogICAgICAgICAgICAgICAgICAgICBjYXNlIEVidEludDoKLSAgICAgICAgICAgICAgICAg ICAgICAgIGxlZnRVbmlvbkFycmF5W2ldLnNldEJDb25zdChub2RlLT5nZXRJQ29uc3Qoc3RhdGlj X2Nhc3Q8aW50PihpKSkgIT0gMCk7CisgICAgICAgICAgICAgICAgICAgICAgICBsZWZ0VW5pb25B cnJheVtpXS5zZXRCQ29uc3Qobm9kZS0+Z2V0SUNvbnN0KGkpICE9IDApOwogICAgICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgRWJ0Qm9vbDoKLSAg ICAgICAgICAgICAgICAgICAgICAgIGxlZnRVbmlvbkFycmF5W2ldLnNldEJDb25zdChub2RlLT5n ZXRCQ29uc3Qoc3RhdGljX2Nhc3Q8Ym9vbD4oaSkpKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGxlZnRVbmlvbkFycmF5W2ldLnNldEJDb25zdChub2RlLT5nZXRCQ29uc3QoaSkpOwogICAgICAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgRWJ0Rmxv YXQ6Ci0gICAgICAgICAgICAgICAgICAgICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRCQ29uc3Qo bm9kZS0+Z2V0RkNvbnN0KHN0YXRpY19jYXN0PGZsb2F0PihpKSkgIT0gMC4wZik7CisgICAgICAg ICAgICAgICAgICAgICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRCQ29uc3Qobm9kZS0+Z2V0RkNv bnN0KGkpICE9IDAuMGYpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvU2luay5p bmZvLm1lc3NhZ2UoRVByZWZpeEludGVybmFsRXJyb3IsIG5vZGUtPmdldExpbmUoKSwgIkNhbm5v dCBwcm9tb3RlIik7CkluZGV4OiBTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIv aW50ZXJtZWRpYXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2NvbXBpbGVyL2ludGVybWVkaWF0ZS5oCShyZXZpc2lvbiAxNTM1MDIpCisrKyBTb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvaW50ZXJtZWRpYXRlLmgJKHdvcmtpbmcgY29weSkK QEAgLTM2OSw5ICszNjksOSBAQCBwdWJsaWM6CiAKICAgICBDb25zdGFudFVuaW9uKiBnZXRVbmlv bkFycmF5UG9pbnRlcigpIGNvbnN0IHsgcmV0dXJuIHVuaW9uQXJyYXlQb2ludGVyOyB9CiAgICAg Ci0gICAgaW50IGdldElDb25zdChpbnQgaW5kZXgpIGNvbnN0IHsgcmV0dXJuIHVuaW9uQXJyYXlQ b2ludGVyID8gdW5pb25BcnJheVBvaW50ZXJbaW5kZXhdLmdldElDb25zdCgpIDogMDsgfQotICAg IGZsb2F0IGdldEZDb25zdChpbnQgaW5kZXgpIGNvbnN0IHsgcmV0dXJuIHVuaW9uQXJyYXlQb2lu dGVyID8gdW5pb25BcnJheVBvaW50ZXJbaW5kZXhdLmdldEZDb25zdCgpIDogMC4wZjsgfQotICAg IGJvb2wgZ2V0QkNvbnN0KGludCBpbmRleCkgY29uc3QgeyByZXR1cm4gdW5pb25BcnJheVBvaW50 ZXIgPyB1bmlvbkFycmF5UG9pbnRlcltpbmRleF0uZ2V0QkNvbnN0KCkgOiBmYWxzZTsgfQorICAg IGludCBnZXRJQ29uc3Qoc2l6ZV90IGluZGV4KSBjb25zdCB7IHJldHVybiB1bmlvbkFycmF5UG9p bnRlciA/IHVuaW9uQXJyYXlQb2ludGVyW2luZGV4XS5nZXRJQ29uc3QoKSA6IDA7IH0KKyAgICBm bG9hdCBnZXRGQ29uc3Qoc2l6ZV90IGluZGV4KSBjb25zdCB7IHJldHVybiB1bmlvbkFycmF5UG9p bnRlciA/IHVuaW9uQXJyYXlQb2ludGVyW2luZGV4XS5nZXRGQ29uc3QoKSA6IDAuMGY7IH0KKyAg ICBib29sIGdldEJDb25zdChzaXplX3QgaW5kZXgpIGNvbnN0IHsgcmV0dXJuIHVuaW9uQXJyYXlQ b2ludGVyID8gdW5pb25BcnJheVBvaW50ZXJbaW5kZXhdLmdldEJDb25zdCgpIDogZmFsc2U7IH0K IAogICAgIHZpcnR1YWwgVEludGVybUNvbnN0YW50VW5pb24qIGdldEFzQ29uc3RhbnRVbmlvbigp ICB7IHJldHVybiB0aGlzOyB9CiAgICAgdmlydHVhbCB2b2lkIHRyYXZlcnNlKFRJbnRlcm1UcmF2 ZXJzZXIqKTsK 207790 2013-07-30 17:24:24 -0700 2013-08-01 13:19:50 -0700 Patch bug-119296-20130730172423.patch text/plain 5595 achristensen SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzUwMikKKysrIFNv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE5IEBACisyMDEzLTA3LTMwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxl LmNvbT4KKworICAgICAgICBGaXhlZCB3cm9uZyBzdGF0aWNfY2FzdGluZyBpbiBBTkdMRSBmcm9t IHIxNTMwNjQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTkyOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHNyYy9jb21waWxlci9JbnRlcm1lZGlhdGUuY3BwOgorICAgICAgICAoVEludGVybWVkaWF0 ZTo6cHJvbW90ZUNvbnN0YW50VW5pb24pOgorICAgICAgICBVbmRpZCBlcnJvbmVvdXMgc3RhdGlj X2Nhc3QgY2hhbmdlLgorICAgICAgICAqIHNyYy9jb21waWxlci9pbnRlcm1lZGlhdGUuaDoKKyAg ICAgICAgKFRJbnRlcm1Db25zdGFudFVuaW9uOjpnZXRJQ29uc3QpOgorICAgICAgICAoVEludGVy bUNvbnN0YW50VW5pb246OmdldEZDb25zdCk6CisgICAgICAgIChUSW50ZXJtQ29uc3RhbnRVbmlv bjo6Z2V0QkNvbnN0KToKKyAgICAgICAgTWFkZSBnZXR0ZXJzIHVzZSBzaXplX3QgaW5zdGVhZCBv ZiBpbnQuCisKIDIwMTMtMDctMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBtYWtlIGRpc3RjaGVjay4KSW5kZXg6 IFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9JbnRlcm1lZGlhdGUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci9JbnRlcm1l ZGlhdGUuY3BwCShyZXZpc2lvbiAxNTM1MDIpCisrKyBTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvY29tcGlsZXIvSW50ZXJtZWRpYXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM3MSwxMyAr MTM3MSwxMyBAQCBUSW50ZXJtVHlwZWQqIFRJbnRlcm1lZGlhdGU6OnByb21vdGVDb25zCiAgICAg ICAgICAgICBjYXNlIEVidEZsb2F0OgogICAgICAgICAgICAgICAgIHN3aXRjaCAobm9kZS0+Z2V0 VHlwZSgpLmdldEJhc2ljVHlwZSgpKSB7CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgRWJ0SW50 OgotICAgICAgICAgICAgICAgICAgICAgICAgbGVmdFVuaW9uQXJyYXlbaV0uc2V0RkNvbnN0KHN0 YXRpY19jYXN0PGZsb2F0Pihub2RlLT5nZXRJQ29uc3Qoc3RhdGljX2Nhc3Q8aW50PihpKSkpKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIGxlZnRVbmlvbkFycmF5W2ldLnNldEZDb25zdChzdGF0 aWNfY2FzdDxmbG9hdD4obm9kZS0+Z2V0SUNvbnN0KGkpKSk7CiAgICAgICAgICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgICAgICAgICAgY2FzZSBFYnRCb29sOgotICAgICAgICAg ICAgICAgICAgICAgICAgbGVmdFVuaW9uQXJyYXlbaV0uc2V0RkNvbnN0KHN0YXRpY19jYXN0PGZs b2F0Pihub2RlLT5nZXRCQ29uc3Qoc3RhdGljX2Nhc3Q8Ym9vbD4oaSkpKSk7CisgICAgICAgICAg ICAgICAgICAgICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRGQ29uc3Qoc3RhdGljX2Nhc3Q8Zmxv YXQ+KG5vZGUtPmdldEJDb25zdChpKSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgRWJ0RmxvYXQ6Ci0gICAgICAgICAgICAgICAgICAg ICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRGQ29uc3Qoc3RhdGljX2Nhc3Q8ZmxvYXQ+KG5vZGUt PmdldEZDb25zdChzdGF0aWNfY2FzdDxmbG9hdD4oaSkpKSk7CisgICAgICAgICAgICAgICAgICAg ICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRGQ29uc3Qoc3RhdGljX2Nhc3Q8ZmxvYXQ+KG5vZGUt PmdldEZDb25zdChpKSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvU2luay5p bmZvLm1lc3NhZ2UoRVByZWZpeEludGVybmFsRXJyb3IsIG5vZGUtPmdldExpbmUoKSwgIkNhbm5v dCBwcm9tb3RlIik7CkBAIC0xMzg3LDEzICsxMzg3LDEzIEBAIFRJbnRlcm1UeXBlZCogVEludGVy bWVkaWF0ZTo6cHJvbW90ZUNvbnMKICAgICAgICAgICAgIGNhc2UgRWJ0SW50OgogICAgICAgICAg ICAgICAgIHN3aXRjaCAobm9kZS0+Z2V0VHlwZSgpLmdldEJhc2ljVHlwZSgpKSB7CiAgICAgICAg ICAgICAgICAgICAgIGNhc2UgRWJ0SW50OgotICAgICAgICAgICAgICAgICAgICAgICAgbGVmdFVu aW9uQXJyYXlbaV0uc2V0SUNvbnN0KHN0YXRpY19jYXN0PGludD4obm9kZS0+Z2V0SUNvbnN0KHN0 YXRpY19jYXN0PGludD4oaSkpKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBsZWZ0VW5pb25B cnJheVtpXS5zZXRJQ29uc3Qoc3RhdGljX2Nhc3Q8aW50Pihub2RlLT5nZXRJQ29uc3QoaSkpKTsK ICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICBjYXNl IEVidEJvb2w6Ci0gICAgICAgICAgICAgICAgICAgICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRJ Q29uc3Qoc3RhdGljX2Nhc3Q8aW50Pihub2RlLT5nZXRCQ29uc3Qoc3RhdGljX2Nhc3Q8Ym9vbD4o aSkpKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRJQ29u c3Qoc3RhdGljX2Nhc3Q8aW50Pihub2RlLT5nZXRCQ29uc3QoaSkpKTsKICAgICAgICAgICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICBjYXNlIEVidEZsb2F0OgotICAg ICAgICAgICAgICAgICAgICAgICAgbGVmdFVuaW9uQXJyYXlbaV0uc2V0SUNvbnN0KHN0YXRpY19j YXN0PGludD4obm9kZS0+Z2V0RkNvbnN0KHN0YXRpY19jYXN0PGZsb2F0PihpKSkpKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGxlZnRVbmlvbkFycmF5W2ldLnNldElDb25zdChzdGF0aWNfY2Fz dDxpbnQ+KG5vZGUtPmdldEZDb25zdChpKSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgICAgICAg ICBpbmZvU2luay5pbmZvLm1lc3NhZ2UoRVByZWZpeEludGVybmFsRXJyb3IsIG5vZGUtPmdldExp bmUoKSwgIkNhbm5vdCBwcm9tb3RlIik7CkBAIC0xNDAzLDEzICsxNDAzLDEzIEBAIFRJbnRlcm1U eXBlZCogVEludGVybWVkaWF0ZTo6cHJvbW90ZUNvbnMKICAgICAgICAgICAgIGNhc2UgRWJ0Qm9v bDoKICAgICAgICAgICAgICAgICBzd2l0Y2ggKG5vZGUtPmdldFR5cGUoKS5nZXRCYXNpY1R5cGUo KSkgewogICAgICAgICAgICAgICAgICAgICBjYXNlIEVidEludDoKLSAgICAgICAgICAgICAgICAg ICAgICAgIGxlZnRVbmlvbkFycmF5W2ldLnNldEJDb25zdChub2RlLT5nZXRJQ29uc3Qoc3RhdGlj X2Nhc3Q8aW50PihpKSkgIT0gMCk7CisgICAgICAgICAgICAgICAgICAgICAgICBsZWZ0VW5pb25B cnJheVtpXS5zZXRCQ29uc3Qobm9kZS0+Z2V0SUNvbnN0KGkpICE9IDApOwogICAgICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgRWJ0Qm9vbDoKLSAg ICAgICAgICAgICAgICAgICAgICAgIGxlZnRVbmlvbkFycmF5W2ldLnNldEJDb25zdChub2RlLT5n ZXRCQ29uc3Qoc3RhdGljX2Nhc3Q8Ym9vbD4oaSkpKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGxlZnRVbmlvbkFycmF5W2ldLnNldEJDb25zdChub2RlLT5nZXRCQ29uc3QoaSkpOwogICAgICAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgRWJ0Rmxv YXQ6Ci0gICAgICAgICAgICAgICAgICAgICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRCQ29uc3Qo bm9kZS0+Z2V0RkNvbnN0KHN0YXRpY19jYXN0PGZsb2F0PihpKSkgIT0gMC4wZik7CisgICAgICAg ICAgICAgICAgICAgICAgICBsZWZ0VW5pb25BcnJheVtpXS5zZXRCQ29uc3Qobm9kZS0+Z2V0RkNv bnN0KGkpICE9IDAuMGYpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvU2luay5p bmZvLm1lc3NhZ2UoRVByZWZpeEludGVybmFsRXJyb3IsIG5vZGUtPmdldExpbmUoKSwgIkNhbm5v dCBwcm9tb3RlIik7CkluZGV4OiBTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIv aW50ZXJtZWRpYXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2NvbXBpbGVyL2ludGVybWVkaWF0ZS5oCShyZXZpc2lvbiAxNTM1MDIpCisrKyBTb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvaW50ZXJtZWRpYXRlLmgJKHdvcmtpbmcgY29weSkK QEAgLTM2OSw5ICszNjksOSBAQCBwdWJsaWM6CiAKICAgICBDb25zdGFudFVuaW9uKiBnZXRVbmlv bkFycmF5UG9pbnRlcigpIGNvbnN0IHsgcmV0dXJuIHVuaW9uQXJyYXlQb2ludGVyOyB9CiAgICAg Ci0gICAgaW50IGdldElDb25zdChpbnQgaW5kZXgpIGNvbnN0IHsgcmV0dXJuIHVuaW9uQXJyYXlQ b2ludGVyID8gdW5pb25BcnJheVBvaW50ZXJbaW5kZXhdLmdldElDb25zdCgpIDogMDsgfQotICAg IGZsb2F0IGdldEZDb25zdChpbnQgaW5kZXgpIGNvbnN0IHsgcmV0dXJuIHVuaW9uQXJyYXlQb2lu dGVyID8gdW5pb25BcnJheVBvaW50ZXJbaW5kZXhdLmdldEZDb25zdCgpIDogMC4wZjsgfQotICAg IGJvb2wgZ2V0QkNvbnN0KGludCBpbmRleCkgY29uc3QgeyByZXR1cm4gdW5pb25BcnJheVBvaW50 ZXIgPyB1bmlvbkFycmF5UG9pbnRlcltpbmRleF0uZ2V0QkNvbnN0KCkgOiBmYWxzZTsgfQorICAg IGludCBnZXRJQ29uc3Qoc2l6ZV90IGluZGV4KSBjb25zdCB7IHJldHVybiB1bmlvbkFycmF5UG9p bnRlciA/IHVuaW9uQXJyYXlQb2ludGVyW2luZGV4XS5nZXRJQ29uc3QoKSA6IDA7IH0KKyAgICBm bG9hdCBnZXRGQ29uc3Qoc2l6ZV90IGluZGV4KSBjb25zdCB7IHJldHVybiB1bmlvbkFycmF5UG9p bnRlciA/IHVuaW9uQXJyYXlQb2ludGVyW2luZGV4XS5nZXRGQ29uc3QoKSA6IDAuMGY7IH0KKyAg ICBib29sIGdldEJDb25zdChzaXplX3QgaW5kZXgpIGNvbnN0IHsgcmV0dXJuIHVuaW9uQXJyYXlQ b2ludGVyID8gdW5pb25BcnJheVBvaW50ZXJbaW5kZXhdLmdldEJDb25zdCgpIDogZmFsc2U7IH0K IAogICAgIHZpcnR1YWwgVEludGVybUNvbnN0YW50VW5pb24qIGdldEFzQ29uc3RhbnRVbmlvbigp ICB7IHJldHVybiB0aGlzOyB9CiAgICAgdmlydHVhbCB2b2lkIHRyYXZlcnNlKFRJbnRlcm1UcmF2 ZXJzZXIqKTsK