43215 2010-07-29 15:08:04 -0700 Implement NPN_Enumerate 2010-07-29 15:22:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 257903 0 andersca 2010-07-29 15:08:04 -0700 Implement NPN_Enumerate 257907 1 62996 andersca 2010-07-29 15:13:54 -0700 Created attachment 62996 Patch 257911 2 webkit.review.bot 2010-07-29 15:16:32 -0700 Attachment 62996 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/Plugins/NPJSObject.cpp:314: NPJSObject::NP_Enumerate is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 257913 3 andersca 2010-07-29 15:22:43 -0700 Committed r64312: <http://trac.webkit.org/changeset/64312> 62996 2010-07-29 15:13:54 -0700 2010-07-29 15:20:58 -0700 Patch bug-43215-20100729151353.patch text/plain 10266 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MWY1ZDU3OTRkZjZmZTBhYWJiNDQzNDI3YjZmNzExNTAyNDhiMjk4OC4uMjhiNTVjOWFhNjUwMWYz YTMzNzA2N2Y1MGRiZDY3ZjVkNzBhNmRiOCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMC0wNy0yOSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBOUE5fRW51bWVyYXRlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzIxNQorCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL0pTTlBPYmplY3QuY3BwOgorICAgICAgICAoV2ViS2l0 OjpucElkZW50aWZpZXJGcm9tSWRlbnRpZmllcik6CisgICAgICAgIEdldCB0aGUgVVRGLTggc3Ry aW5nIHJlcHJlc2VudGF0aW9uIGluc3RlYWQgb2YgdGhlIGxvc3N5IEFTQ0lJIHJlcHJlc2VudGF0 aW9uLgorICAgICAgICAKKyAgICAgICAgKFdlYktpdDo6SlNOUE9iamVjdDo6Z2V0T3duUHJvcGVy dHlOYW1lcyk6CisgICAgICAgIEltcGxlbWVudCBieSBjYWxsaW5nIHRoZSBOUENsYXNzOjplbnVt ZXJhdGUgZnVuY3Rpb24uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvSlNOUE9iamVj dC5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OUEpTT2JqZWN0LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6TlBKU09iamVjdDo6ZW51bWVyYXRlKToKKyAgICAgICAgSW1wbGVtZW50IGJ5 IGNhbGxpbmcgSlNPYmplY3Q6OmdldFByb3BlcnR5TmFtZXMuCisKKyAgICAgICAgKFdlYktpdDo6 TlBKU09iamVjdDo6bnBDbGFzcyk6CisgICAgICAgIChXZWJLaXQ6Ok5QSlNPYmplY3Q6Ok5QX0Vu dW1lcmF0ZSk6CisgICAgICAgIENhbGwgTlBKU09iamVjdDo6ZW51bWVyYXRlLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNz L1BsdWdpbnMvTlBSdW50aW1lVXRpbGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Y3JlYXRl TlBPYmplY3QpOgorICAgICAgICBGaXggYSBjb21tZW50LgorCisgICAgICAgICogV2ViUHJvY2Vz cy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcDoKKyAgICAgICAgKFdl YktpdDo6TlBOX0VudW1lcmF0ZSk6CisgICAgICAgIENhbGwgdGhlIE5QQ2xhc3M6OmVudW1lcmF0 ZSBmdW5jdGlvbi4KKwogMjAxMC0wNy0yOSAgSm9obiBTdWxsaXZhbiAgPHN1bGxpdmFuQGFwcGxl LmNvbT4KIAogICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQzMjAzPgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvSlNOUE9iamVj dC5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9KU05QT2JqZWN0LmNwcAppbmRleCBi YWZiNTRiMGEwM2UzODJlZmUyNGUzZTA5N2I2YTFiOGZmZGRkYTZlLi4yOGMwODIxNmE3Y2I0OTIx YmY3MzJiZWRjOTI4YjMzMWUwZjhmYjYxIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9KU05QT2JqZWN0LmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9K U05QT2JqZWN0LmNwcApAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3Jl L09iamVjdFByb3RvdHlwZS5oPgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0pTTG9jay5oPgog I2luY2x1ZGUgPFdlYkNvcmUvSWRlbnRpZmllclJlcC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvUGxh dGZvcm1TdHJpbmcuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3Bh Y2UgSlNDOwpAQCAtNDEsNyArNDIsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogc3RhdGljIE5Q SWRlbnRpZmllciBucElkZW50aWZpZXJGcm9tSWRlbnRpZmllcihjb25zdCBJZGVudGlmaWVyJiBp ZGVudGlmaWVyKQogewotICAgIHJldHVybiBzdGF0aWNfY2FzdDxOUElkZW50aWZpZXI+KElkZW50 aWZpZXJSZXA6OmdldChpZGVudGlmaWVyLmFzY2lpKCkpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nh c3Q8TlBJZGVudGlmaWVyPihJZGVudGlmaWVyUmVwOjpnZXQoaWRlbnRpZmllci51c3RyaW5nKCku VVRGOFN0cmluZygpLmRhdGEoKSkpOwogfQogCiBjb25zdCBDbGFzc0luZm8gSlNOUE9iamVjdDo6 c19pbmZvID0geyAiTlBPYmplY3QiLCAwLCAwLCAwIH07CkBAIC0yMjcsNiArMjI4LDQ4IEBAIHZv aWQgSlNOUE9iamVjdDo6cHV0KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSWRlbnRpZmllciYgcHJv cGVydHlOYW1lLCBKU1ZhbHVlIHZhCiAgICAgcmVsZWFzZU5QVmFyaWFudFZhbHVlKCZ2YXJpYW50 KTsKIH0KIAordm9pZCBKU05QT2JqZWN0OjpnZXRPd25Qcm9wZXJ0eU5hbWVzKEV4ZWNTdGF0ZSog ZXhlYywgUHJvcGVydHlOYW1lQXJyYXkmIHByb3BlcnR5TmFtZUFycmF5LCBFbnVtZXJhdGlvbk1v ZGUgbW9kZSkKK3sKKyAgICBpZiAoIW1fbnBPYmplY3QpIHsKKyAgICAgICAgdGhyb3dJbnZhbGlk QWNjZXNzRXJyb3IoZXhlYyk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoIU5Q X0NMQVNTX1NUUlVDVF9WRVJTSU9OX0hBU19FTlVNKG1fbnBPYmplY3QtPl9jbGFzcykgfHwgIW1f bnBPYmplY3QtPl9jbGFzcy0+ZW51bWVyYXRlKQorICAgICAgICByZXR1cm47CisKKyAgICBOUElk ZW50aWZpZXIqIGlkZW50aWZpZXJzID0gMDsKKyAgICB1aW50MzJfdCBpZGVudGlmaWVyQ291bnQg PSAwOworICAgIAorICAgIHsKKyAgICAgICAgSlNMb2NrOjpEcm9wQWxsTG9ja3MgZHJvcEFsbExv Y2tzKFNpbGVuY2VBc3NlcnRpb25zT25seSk7CisKKyAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBl bnVtZXJhdGUgc2V0dGluZyBhbiBleGNlcHRpb24uCisgICAgICAgIC8vIEZJWE1FOiBGaW5kIG91 dCB3aGF0IGhhcHBlbnMgaWYgY2FsbGluZyBlbnVtZXJhdGUgY2F1c2VzIHRoZSBwbHVnLWluIHRv IGdvIGF3YXkuCisgICAgICAgIC8vIEZJWE1FOiBTaG91bGQgd2UgdGhyb3cgYW4gZXhjZXB0aW9u IGlmIGVudW1lcmF0ZSByZXR1cm5zIGZhbHNlPworICAgICAgICBpZiAoIW1fbnBPYmplY3QtPl9j bGFzcy0+ZW51bWVyYXRlKG1fbnBPYmplY3QsICZpZGVudGlmaWVycywgJmlkZW50aWZpZXJDb3Vu dCkpCisgICAgICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgZm9yICh1aW50MzJfdCBpID0g MDsgaSA8IGlkZW50aWZpZXJDb3VudDsgKytpKSB7CisgICAgICAgIElkZW50aWZpZXJSZXAqIGlk ZW50aWZpZXJSZXAgPSBzdGF0aWNfY2FzdDxJZGVudGlmaWVyUmVwKj4oaWRlbnRpZmllcnNbaV0p OworICAgICAgICAKKyAgICAgICAgSWRlbnRpZmllciBpZGVudGlmaWVyOworICAgICAgICBpZiAo aWRlbnRpZmllclJlcC0+aXNTdHJpbmcoKSkgeworICAgICAgICAgICAgY29uc3QgY2hhciogc3Ry aW5nID0gaWRlbnRpZmllclJlcC0+c3RyaW5nKCk7CisgICAgICAgICAgICBpbnQgbGVuZ3RoID0g c3RybGVuKHN0cmluZyk7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGlkZW50aWZpZXIgPSBJ ZGVudGlmaWVyKGV4ZWMsIFN0cmluZzo6ZnJvbVVURjhXaXRoTGF0aW4xRmFsbGJhY2soc3RyaW5n LCBsZW5ndGgpLmltcGwoKSk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgaWRlbnRpZmll ciA9IElkZW50aWZpZXI6OmZyb20oZXhlYywgaWRlbnRpZmllclJlcC0+bnVtYmVyKCkpOworCisg ICAgICAgIHByb3BlcnR5TmFtZUFycmF5LmFkZChpZGVudGlmaWVyKTsKKyAgICB9CisKKyAgICAv LyBUaGlzIHNob3VsZCB1c2UgTlBOX01lbUZyZWUsIGJ1dCB3ZSBrbm93IHRoYXQgaXQgdXNlcyBm cmVlIHVuZGVyIHRoZSBob29kLgorICAgIGZyZWUoaWRlbnRpZmllcnMpOworfQorCiBKU1ZhbHVl IEpTTlBPYmplY3Q6OnByb3BlcnR5R2V0dGVyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90 QmFzZSwgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lKQogewogICAgIEpTTlBPYmplY3Qq IHRoaXNPYmogPSBzdGF0aWNfY2FzdDxKU05QT2JqZWN0Kj4oYXNPYmplY3Qoc2xvdEJhc2UpKTsK ZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0pTTlBPYmplY3QuaCBiL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0pTTlBPYmplY3QuaAppbmRleCA5YzlkYmEwODMxMWM5 Y2EyZDk1M2E0NTUwYjVhMjA2MGNlOGExNWZiLi45Njg1YTU5Y2E0Mzk5ZDQ1NGZiYzg0ZmY5NWU0 YTkzNjFkYTJkODBmIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9KU05Q T2JqZWN0LmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvSlNOUE9iamVjdC5oCkBA IC02MSw2ICs2MSw4IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIGdldE93blByb3BlcnR5 RGVzY3JpcHRvcihKU0M6OkV4ZWNTdGF0ZSosIGNvbnN0IEpTQzo6SWRlbnRpZmllciYgcHJvcGVy dHlOYW1lLCBKU0M6OlByb3BlcnR5RGVzY3JpcHRvciYpOwogICAgIHZpcnR1YWwgdm9pZCBwdXQo SlNDOjpFeGVjU3RhdGUqLCBjb25zdCBKU0M6OklkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgSlND OjpKU1ZhbHVlLCBKU0M6OlB1dFByb3BlcnR5U2xvdCYpOwogCisgICAgdmlydHVhbCB2b2lkIGdl dE93blByb3BlcnR5TmFtZXMoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OlByb3BlcnR5TmFtZUFycmF5 JiwgSlNDOjpFbnVtZXJhdGlvbk1vZGUgbW9kZSA9IEpTQzo6RXhjbHVkZURvbnRFbnVtUHJvcGVy dGllcyk7CisKICAgICBzdGF0aWMgSlNDOjpKU1ZhbHVlIHByb3BlcnR5R2V0dGVyKEpTQzo6RXhl Y1N0YXRlKiwgSlNDOjpKU1ZhbHVlLCBjb25zdCBKU0M6OklkZW50aWZpZXImKTsKICAgICBzdGF0 aWMgSlNDOjpKU1ZhbHVlIG1ldGhvZEdldHRlcihKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1 ZSwgY29uc3QgSlNDOjpJZGVudGlmaWVyJik7CiAgICAgc3RhdGljIEpTQzo6SlNPYmplY3QqIHRo cm93SW52YWxpZEFjY2Vzc0Vycm9yKEpTQzo6RXhlY1N0YXRlKik7CmRpZmYgLS1naXQgYS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OUEpTT2JqZWN0LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL05QSlNPYmplY3QuY3BwCmluZGV4IDJlYWRmYmNiM2ZiMDdkNGE3YzQyMDhmZTBk Y2Y0MzA5YTM2MjY5ZTUuLjAwMjI1N2UwMTk4NDViM2FlNmY3ZmZjZTI5MWY2NDE2MDkxOGQwMTUg MTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuY3BwCisr KyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuY3BwCkBAIC0xNzEsNiAr MTcxLDI5IEBAIGJvb2wgTlBKU09iamVjdDo6Z2V0UHJvcGVydHkoTlBJZGVudGlmaWVyIHByb3Bl cnR5TmFtZSwgTlBWYXJpYW50KiByZXN1bHQpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK2Jvb2wg TlBKU09iamVjdDo6ZW51bWVyYXRlKE5QSWRlbnRpZmllcioqIGlkZW50aWZpZXJzLCB1aW50MzJf dCogaWRlbnRpZmllckNvdW50KQoreworICAgIEV4ZWNTdGF0ZSogZXhlYyA9IG1fb2JqZWN0TWFw LT5nbG9iYWxFeGVjKCk7CisgICAgaWYgKCFleGVjKQorICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgCisgICAgSlNMb2NrIGxvY2soU2lsZW5jZUFzc2VydGlvbnNPbmx5KTsKKworICAgIFByb3Bl cnR5TmFtZUFycmF5IHByb3BlcnR5TmFtZXMoZXhlYyk7CisgICAgbV9qc09iamVjdC0+Z2V0UHJv cGVydHlOYW1lcyhleGVjLCBwcm9wZXJ0eU5hbWVzKTsKKworICAgIC8vIFRoaXMgc2hvdWxkIHVz ZSBOUE5fTWVtQWxsb2MsIGJ1dCB3ZSBrbm93IHRoYXQgaXQgdXNlcyBtYWxsb2MgdW5kZXIgdGhl IGhvb2QuCisgICAgTlBJZGVudGlmaWVyKiBuYW1lSWRlbnRpZmllcnMgPSBzdGF0aWNfY2FzdDxO UElkZW50aWZpZXIqPihtYWxsb2Moc2l6ZW9mKE5QSWRlbnRpZmllcikgKiBwcm9wZXJ0eU5hbWVz LnNpemUoKSkpOworCisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBwcm9wZXJ0eU5hbWVzLnNp emUoKTsgKytpKQorICAgICAgICBuYW1lSWRlbnRpZmllcnNbaV0gPSBzdGF0aWNfY2FzdDxOUElk ZW50aWZpZXI+KElkZW50aWZpZXJSZXA6OmdldChwcm9wZXJ0eU5hbWVzW2ldLnVzdHJpbmcoKS5V VEY4U3RyaW5nKCkuZGF0YSgpKSk7CisKKyAgICAqaWRlbnRpZmllcnMgPSBuYW1lSWRlbnRpZmll cnM7CisgICAgKmlkZW50aWZpZXJDb3VudCA9IHByb3BlcnR5TmFtZXMuc2l6ZSgpOworCisgICAg cmV0dXJuIHRydWU7Cit9CisKIGJvb2wgTlBKU09iamVjdDo6Y29uc3RydWN0KGNvbnN0IE5QVmFy aWFudCAqYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQgKnJlc3Vs dCkKIHsKICAgICBFeGVjU3RhdGUqIGV4ZWMgPSBtX29iamVjdE1hcC0+Z2xvYmFsRXhlYygpOwpA QCAtMjM3LDcgKzI2MCw3IEBAIE5QQ2xhc3MqIE5QSlNPYmplY3Q6Om5wQ2xhc3MoKQogICAgICAg ICBOUF9HZXRQcm9wZXJ0eSwKICAgICAgICAgTlBfU2V0UHJvcGVydHksCiAgICAgICAgIDAsCi0g ICAgICAgIDAsCisgICAgICAgIE5QX0VudW1lcmF0ZSwKICAgICAgICAgTlBfQ29uc3RydWN0CiAg ICAgfTsKIApAQCAtMjg4LDYgKzMxMSwxMSBAQCBib29sIE5QSlNPYmplY3Q6Ok5QX1NldFByb3Bl cnR5KE5QT2JqZWN0KiwgTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSwgY29uc3QgTlBWYQogICAg IHJldHVybiBmYWxzZTsKIH0KIAorYm9vbCBOUEpTT2JqZWN0OjpOUF9FbnVtZXJhdGUoTlBPYmpl Y3QqIG5wT2JqZWN0LCBOUElkZW50aWZpZXIqKiBpZGVudGlmaWVycywgdWludDMyX3QqIGlkZW50 aWZpZXJDb3VudCkKK3sKKyAgICByZXR1cm4gdG9OUEpTT2JqZWN0KG5wT2JqZWN0KS0+ZW51bWVy YXRlKGlkZW50aWZpZXJzLCBpZGVudGlmaWVyQ291bnQpOworfQorCiBib29sIE5QSlNPYmplY3Q6 Ok5QX0NvbnN0cnVjdChOUE9iamVjdCogbnBPYmplY3QsIGNvbnN0IE5QVmFyaWFudCogYXJndW1l bnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQqIHJlc3VsdCkKIHsKICAgICBy ZXR1cm4gdG9OUEpTT2JqZWN0KG5wT2JqZWN0KS0+Y29uc3RydWN0KGFyZ3VtZW50cywgYXJndW1l bnRDb3VudCwgcmVzdWx0KTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05QSlNPYmplY3QuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuaApp bmRleCA1NTRmOTRhMWFlZmNlYWU4MjdkZjQ5MjRhZjk4NTRkNjIwZDhmMTVhLi4yODFiMmMwZGQ2 M2NjMTM2MmRlNjVkOWI5ZGQwNjI3NzBjNDk4ZmIzIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9OUEpTT2JqZWN0LmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTlBKU09iamVjdC5oCkBAIC02NSw2ICs2NSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBpbnZv a2VEZWZhdWx0KGNvbnN0IE5QVmFyaWFudCogYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENv dW50LCBOUFZhcmlhbnQqIHJlc3VsdCk7CiAgICAgYm9vbCBoYXNQcm9wZXJ0eShOUElkZW50aWZp ZXIgcHJvcGVydHlOYW1lKTsKICAgICBib29sIGdldFByb3BlcnR5KE5QSWRlbnRpZmllciBwcm9w ZXJ0eU5hbWUsIE5QVmFyaWFudCogcmVzdWx0KTsKKyAgICBib29sIGVudW1lcmF0ZShOUElkZW50 aWZpZXIqKiBpZGVudGlmaWVycywgdWludDMyX3QqIGlkZW50aWZpZXJDb3VudCk7CiAgICAgYm9v bCBjb25zdHJ1Y3QoY29uc3QgTlBWYXJpYW50KiBhcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50 Q291bnQsIE5QVmFyaWFudCogcmVzdWx0KTsKIAogICAgIGJvb2wgaW52b2tlKEpTQzo6RXhlY1N0 YXRlKiwgSlNDOjpKU0dsb2JhbE9iamVjdCosIEpTQzo6SlNWYWx1ZSBmdW5jdGlvbiwgY29uc3Qg TlBWYXJpYW50KiBhcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE5QVmFyaWFudCog cmVzdWx0KTsKQEAgLTc4LDYgKzc5LDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCBOUF9I YXNQcm9wZXJ0eShOUE9iamVjdCosIE5QSWRlbnRpZmllciBwcm9wZXJ0eU5hbWUpOwogICAgIHN0 YXRpYyBib29sIE5QX0dldFByb3BlcnR5KE5QT2JqZWN0KiwgTlBJZGVudGlmaWVyIHByb3BlcnR5 TmFtZSwgTlBWYXJpYW50KiByZXN1bHQpOwogICAgIHN0YXRpYyBib29sIE5QX1NldFByb3BlcnR5 KE5QT2JqZWN0KiwgTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSwgY29uc3QgTlBWYXJpYW50KiB2 YWx1ZSk7CisgICAgc3RhdGljIGJvb2wgTlBfRW51bWVyYXRlKE5QT2JqZWN0KiwgTlBJZGVudGlm aWVyKiogaWRlbnRpZmllcnMsIHVpbnQzMl90KiBpZGVudGlmaWVyQ291bnQpOwogICAgIHN0YXRp YyBib29sIE5QX0NvbnN0cnVjdChOUE9iamVjdCosIGNvbnN0IE5QVmFyaWFudCogYXJndW1lbnRz LCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQqIHJlc3VsdCk7CiAgICAgCiAgICAg TlBSdW50aW1lT2JqZWN0TWFwKiBtX29iamVjdE1hcDsKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZVV0aWxpdGllcy5jcHAgYi9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OUFJ1bnRpbWVVdGlsaXRpZXMuY3BwCmluZGV4IDNiM2VjZWNiODQ5OTBjYjdh NTM1ZmE5NTNjMzJjNmIyYzE2ODE0MTkuLjFjNzI3MGZiNGMyNTQwNjg1NzRhNjE3NjIyZWUwYTBk NTJlN2IzMjMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGlt ZVV0aWxpdGllcy5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTlBSdW50aW1l VXRpbGl0aWVzLmNwcApAQCAtMzUsOCArMzUsNyBAQCBOUE9iamVjdCogY3JlYXRlTlBPYmplY3Qo TlBQIG5wcCwgTlBDbGFzcyogbnBDbGFzcykKICAgICBpZiAobnBDbGFzcy0+YWxsb2NhdGUpCiAg ICAgICAgIG5wT2JqZWN0ID0gbnBDbGFzcy0+YWxsb2NhdGUobnBwLCBucENsYXNzKTsKICAgICBl bHNlIHsKLSAgICAgICAgLy8gVGhpcyBzaG91bGQgcmVhbGx5IGNhbGwgTlBOX01lbUFsbG9jLCBi dXQgd2Uga25vdyB0aGF0IGl0IHVzZXMgbWFsbG9jCi0gICAgICAgIC8vIHVuZGVyIHRoZSBob29k IHNvIGl0J3MgZmluZS4KKyAgICAgICAgLy8gVGhpcyBzaG91bGQgdXNlIE5QTl9NZW1BbGxvYywg YnV0IHdlIGtub3cgdGhhdCBpdCB1c2VzIG1hbGxvYyB1bmRlciB0aGUgaG9vZC4KICAgICAgICAg bnBPYmplY3QgPSBzdGF0aWNfY2FzdDxOUE9iamVjdCo+KG1hbGxvYyhzaXplb2YoTlBPYmplY3Qp KSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRz Y2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAKaW5kZXggZWE2YjE4YWE0NmUyYjZi NjFhZDUzMzYyYjk1YzhlM2EzNTA4MTZjMi4uYWQ2NTcxNzE4NTU4MGRlZGI3NTZkYzE4MjI4ZTZh NDliM2ExNWQ4MiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2Nh cGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcApAQCAtNjMxLDkgKzYzMSwxMSBA QCBzdGF0aWMgdm9pZCBOUE5fUG9wUG9wdXBzRW5hYmxlZFN0YXRlKE5QUCBpbnN0YW5jZSkKICAg ICBub3RJbXBsZW1lbnRlZCgpOwogfQogICAgIAotc3RhdGljIGJvb2wgTlBOX0VudW1lcmF0ZShO UFAgbnBwLCBOUE9iamVjdCogbnBvYmosIE5QSWRlbnRpZmllcioqIGlkZW50aWZpZXIsIHVpbnQz Ml90KiBjb3VudCkKK3N0YXRpYyBib29sIE5QTl9FbnVtZXJhdGUoTlBQLCBOUE9iamVjdCogbnBP YmplY3QsIE5QSWRlbnRpZmllcioqIGlkZW50aWZpZXJzLCB1aW50MzJfdCogaWRlbnRpZmllckNv dW50KQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgaWYgKE5QX0NMQVNTX1NUUlVDVF9W RVJTSU9OX0hBU19FTlVNKG5wT2JqZWN0LT5fY2xhc3MpICYmIG5wT2JqZWN0LT5fY2xhc3MtPmVu dW1lcmF0ZSkKKyAgICAgICAgcmV0dXJuIG5wT2JqZWN0LT5fY2xhc3MtPmVudW1lcmF0ZShucE9i amVjdCwgaWRlbnRpZmllcnMsIGlkZW50aWZpZXJDb3VudCk7CisKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAK