36337 2010-03-18 17:11:28 -0700 Log an error when an OOP plug-in sends an unknown object id 2010-03-19 11:20:18 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC All RESOLVED FIXED P4 Normal --- 1 ap ap oldest_to_newest 201647 0 ap 2010-03-18 17:11:28 -0700 This can only happen due to an error in WK/WKPH communication code. We already have early return for those, but debug output would make investigating problems easier. 201648 1 51112 ap 2010-03-18 17:14:25 -0700 Created attachment 51112 proposed patch 201649 2 51112 darin 2010-03-18 17:15:44 -0700 Comment on attachment 51112 proposed patch > + LOG_ERROR("NetscapePluginInstanceProxy::evaluate: local object %u doesn't exist."); You used "%u" but forgot to pass a number. Every time! 201653 3 51115 ap 2010-03-18 17:30:33 -0700 Created attachment 51115 proposed patch Note to self: don't build and test in 32 bit when changing OOP code. 201654 4 51115 darin 2010-03-18 17:41:17 -0700 Comment on attachment 51115 proposed patch > + LOG_ERROR("NetscapePluginInstanceProxy::evaluate: local object %u doesn't exist.", objectID); To be pedantic, %u is for printing values of type unsigned. Since objectID is of type uint32_t the correct format string is: ... object " PRIu32 " doesn't ... Of course, I'm not really sure that uint32_t is better than unsigned here. And this can probably land as-is, but it's an example of why I think types like uint32_t aren't all that great as abstractions. r=me 201945 5 ap 2010-03-19 11:20:18 -0700 Committed revision 56247. If I'm not mistaken, PRIu32 would only be necessary for 16-bit platforms, so landed as is. 51112 2010-03-18 17:14:25 -0700 2010-03-18 17:30:33 -0700 proposed patch LogBadIDs.txt text/plain 7029 ap SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NjIwMikKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTAtMDMtMTggIEFsZXhleSBQcm9za3VyeWFrb3Yg IDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MzM3Cisg ICAgICAgIExvZyBhbiBlcnJvciB3aGVuIGFuIE9PUCBwbHVnLWluIHNlbmRzIGFuIHVua25vd24g b2JqZWN0IGlkCisKKyAgICAgICAgTWFraW5nIHRoZXNlIExPR19FUlJPUiBhbmQgbm90IEFTU0VS VHMsIGJlY2F1c2UgSSBkb24ndCB3YW50IGVhcmx5IHJldHVybnMgdG8gbG9vaworICAgICAgICB0 ZW1wb3Jhcnkgb3IgcmVkdW5kYW50LgorCisgICAgICAgICogUGx1Z2lucy9Ib3N0ZWQvTmV0c2Nh cGVQbHVnaW5JbnN0YW5jZVByb3h5Lm1tOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdp bkluc3RhbmNlUHJveHk6OmV2YWx1YXRlKToKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVn aW5JbnN0YW5jZVByb3h5OjppbnZva2UpOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdp bkluc3RhbmNlUHJveHk6Omludm9rZURlZmF1bHQpOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2Fw ZVBsdWdpbkluc3RhbmNlUHJveHk6OmNvbnN0cnVjdCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNj YXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Z2V0UHJvcGVydHkpOgorICAgICAgICAoV2ViS2l0OjpO ZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OnNldFByb3BlcnR5KToKKyAgICAgICAgKFdlYktp dDo6TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpyZW1vdmVQcm9wZXJ0eSk6CisgICAgICAg IChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6aGFzUHJvcGVydHkpOgorICAg ICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6Omhhc01ldGhvZCk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6ZW51bWVyYXRlKToK KwogMjAxMC0wMy0xNiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9I b3N0ZWQvTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5Lm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5Lm1tCShyZXZp c2lvbiA1NjA3OSkKKysrIFdlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5J bnN0YW5jZVByb3h5Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC04MjksOCArODI5LDEwIEBAIGJvb2wg TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpldmFsdWEKICAgICByZXN1bHREYXRhID0gMDsK ICAgICByZXN1bHRMZW5ndGggPSAwOwogCi0gICAgaWYgKCFtX2xvY2FsT2JqZWN0cy5jb250YWlu cyhvYmplY3RJRCkpCisgICAgaWYgKCFtX2xvY2FsT2JqZWN0cy5jb250YWlucyhvYmplY3RJRCkp IHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OmV2YWx1 YXRlOiBsb2NhbCBvYmplY3QgJXUgZG9lc24ndCBleGlzdC4iKTsKICAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIH0KIAogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoW21fcGx1Z2luVmlldyB3ZWJG cmFtZV0pOwogICAgIGlmICghZnJhbWUpCkBAIC04NzIsOCArODc0LDEwIEBAIGJvb2wgTmV0c2Nh cGVQbHVnaW5JbnN0YW5jZVByb3h5OjppbnZva2UKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IAogICAgIEpTT2JqZWN0KiBvYmplY3QgPSBtX2xvY2FsT2JqZWN0cy5nZXQob2JqZWN0SUQpOwot ICAgIGlmICghb2JqZWN0KQorICAgIGlmICghb2JqZWN0KSB7CisgICAgICAgIExPR19FUlJPUigi TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjppbnZva2U6IGxvY2FsIG9iamVjdCAldSBkb2Vz bid0IGV4aXN0LiIpOwogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogICAgIAogICAgIEZy YW1lKiBmcmFtZSA9IGNvcmUoW21fcGx1Z2luVmlldyB3ZWJGcmFtZV0pOwogICAgIGlmICghZnJh bWUpCkBAIC05MDYsOCArOTEwLDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5 OjppbnZva2UKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVjdCA9 IG1fbG9jYWxPYmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAgaWYg KCFvYmplY3QpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJv eHk6Omludm9rZURlZmF1bHQ6IGxvY2FsIG9iamVjdCAldSBkb2Vzbid0IGV4aXN0LiIpOwogICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogICAgIAogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUo W21fcGx1Z2luVmlldyB3ZWJGcmFtZV0pOwogICAgIGlmICghZnJhbWUpCkBAIC05MzksOCArOTQ1 LDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5Ojpjb25zdHIKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVjdCA9IG1fbG9jYWxPYmplY3RzLmdl dChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAg ICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OmNvbnN0cnVjdDogbG9j YWwgb2JqZWN0ICV1IGRvZXNuJ3QgZXhpc3QuIik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICB9CiAgICAgCiAgICAgRnJhbWUqIGZyYW1lID0gY29yZShbbV9wbHVnaW5WaWV3IHdlYkZyYW1l XSk7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTk3Myw4ICs5ODEsMTAgQEAgYm9vbCBOZXRzY2FwZVBs dWdpbkluc3RhbmNlUHJveHk6OmdldFBybwogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBK U09iamVjdCogb2JqZWN0ID0gbV9sb2NhbE9iamVjdHMuZ2V0KG9iamVjdElEKTsKLSAgICBpZiAo IW9iamVjdCkKKyAgICBpZiAoIW9iamVjdCkgeworICAgICAgICBMT0dfRVJST1IoIk5ldHNjYXBl UGx1Z2luSW5zdGFuY2VQcm94eTo6Z2V0UHJvcGVydHk6IGxvY2FsIG9iamVjdCAldSBkb2Vzbid0 IGV4aXN0LiIpOwogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogICAgIAogICAgIEZyYW1l KiBmcmFtZSA9IGNvcmUoW21fcGx1Z2luVmlldyB3ZWJGcmFtZV0pOwogICAgIGlmICghZnJhbWUp CkBAIC05OTIsOCArMTAwMiwxMCBAQCBib29sIE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6 Z2V0UHJvCiBib29sIE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Z2V0UHJvcGVydHkodWlu dDMyX3Qgb2JqZWN0SUQsIHVuc2lnbmVkIHByb3BlcnR5TmFtZSwgZGF0YV90JiByZXN1bHREYXRh LCBtYWNoX21zZ190eXBlX251bWJlcl90JiByZXN1bHRMZW5ndGgpCiB7CiAgICAgSlNPYmplY3Qq IG9iamVjdCA9IG1fbG9jYWxPYmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3Qp CisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbklu c3RhbmNlUHJveHk6OmdldFByb3BlcnR5OiBsb2NhbCBvYmplY3QgJXUgZG9lc24ndCBleGlzdC4i KTsKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAgICAKICAgICBGcmFtZSogZnJhbWUg PSBjb3JlKFttX3BsdWdpblZpZXcgd2ViRnJhbWVdKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtMTAx NCw4ICsxMDI2LDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpzZXRQcm8K ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVjdCA9IG1fbG9jYWxP YmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAgaWYgKCFvYmplY3Qp IHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OnNldFBy b3BlcnR5OiBsb2NhbCBvYmplY3QgJXUgZG9lc24ndCBleGlzdC4iKTsKICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIH0KICAgICAKICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKFttX3BsdWdpblZp ZXcgd2ViRnJhbWVdKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtMTAzOCw4ICsxMDUyLDEwIEBAIGJv b2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpzZXRQcm8KICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVjdCA9IG1fbG9jYWxPYmplY3RzLmdldChvYmplY3RJ RCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAgICAgTE9HX0VS Uk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OnNldFByb3BlcnR5OiBsb2NhbCBvYmpl Y3QgJXUgZG9lc24ndCBleGlzdC4iKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAg ICAKICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKFttX3BsdWdpblZpZXcgd2ViRnJhbWVdKTsKICAg ICBpZiAoIWZyYW1lKQpAQCAtMTA2MSw4ICsxMDc3LDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5J bnN0YW5jZVByb3h5OjpyZW1vdmUKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmpl Y3QqIG9iamVjdCA9IG1fbG9jYWxPYmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmpl Y3QpCisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdp bkluc3RhbmNlUHJveHk6OnJlbW92ZVByb3BlcnR5OiBsb2NhbCBvYmplY3QgJXUgZG9lc24ndCBl eGlzdC4iKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAgICAKICAgICBGcmFtZSog ZnJhbWUgPSBjb3JlKFttX3BsdWdpblZpZXcgd2ViRnJhbWVdKTsKICAgICBpZiAoIWZyYW1lKQpA QCAtMTA4Niw4ICsxMTA0LDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5Ojpy ZW1vdmUKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVjdCA9IG1f bG9jYWxPYmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAgaWYgKCFv YmplY3QpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6 OnJlbW92ZVByb3BlcnR5OiBsb2NhbCBvYmplY3QgJXUgZG9lc24ndCBleGlzdC4iKTsKICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAgICAKICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKFtt X3BsdWdpblZpZXcgd2ViRnJhbWVdKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtMTExMSw4ICsxMTMx LDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpoYXNQcm8KICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVjdCA9IG1fbG9jYWxPYmplY3RzLmdl dChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAg ICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6Omhhc1Byb3BlcnR5OiBs b2NhbCBvYmplY3QgJXUgZG9lc24ndCBleGlzdC4iKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIH0KICAgICAKICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKFttX3BsdWdpblZpZXcgd2ViRnJh bWVdKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtMTEzMSw4ICsxMTUzLDEwIEBAIGJvb2wgTmV0c2Nh cGVQbHVnaW5JbnN0YW5jZVByb3h5OjpoYXNQcm8KICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgSlNPYmplY3QqIG9iamVjdCA9IG1fbG9jYWxPYmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAg aWYgKCFvYmplY3QpCisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRz Y2FwZVBsdWdpbkluc3RhbmNlUHJveHk6Omhhc1Byb3BlcnR5OiBsb2NhbCBvYmplY3QgJXUgZG9l c24ndCBleGlzdC4iKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAgICAKICAgICBG cmFtZSogZnJhbWUgPSBjb3JlKFttX3BsdWdpblZpZXcgd2ViRnJhbWVdKTsKICAgICBpZiAoIWZy YW1lKQpAQCAtMTE1MSw4ICsxMTc1LDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVBy b3h5OjpoYXNNZXQKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVj dCA9IG1fbG9jYWxPYmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAg aWYgKCFvYmplY3QpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNl UHJveHk6Omhhc01ldGhvZDogbG9jYWwgb2JqZWN0ICV1IGRvZXNuJ3QgZXhpc3QuIik7CiAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKFttX3Bs dWdpblZpZXcgd2ViRnJhbWVdKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtMTE3MSw4ICsxMTk3LDEw IEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjplbnVtZXIKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVjdCA9IG1fbG9jYWxPYmplY3RzLmdldChv YmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAgICAg TE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OmVudW1lcmF0ZTogbG9jYWwg b2JqZWN0ICV1IGRvZXNuJ3QgZXhpc3QuIik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9 CiAgICAgCiAgICAgRnJhbWUqIGZyYW1lID0gY29yZShbbV9wbHVnaW5WaWV3IHdlYkZyYW1lXSk7 CiAgICAgaWYgKCFmcmFtZSkK 51115 2010-03-18 17:30:33 -0700 2010-03-18 17:41:17 -0700 proposed patch LogBadIDs.txt text/plain 7169 ap SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NjIwMikKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTAtMDMtMTggIEFsZXhleSBQcm9za3VyeWFrb3Yg IDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MzM3Cisg ICAgICAgIExvZyBhbiBlcnJvciB3aGVuIGFuIE9PUCBwbHVnLWluIHNlbmRzIGFuIHVua25vd24g b2JqZWN0IGlkCisKKyAgICAgICAgTWFraW5nIHRoZXNlIExPR19FUlJPUiBhbmQgbm90IEFTU0VS VHMsIGJlY2F1c2UgSSBkb24ndCB3YW50IGVhcmx5IHJldHVybnMgdG8gbG9vaworICAgICAgICB0 ZW1wb3Jhcnkgb3IgcmVkdW5kYW50LgorCisgICAgICAgICogUGx1Z2lucy9Ib3N0ZWQvTmV0c2Nh cGVQbHVnaW5JbnN0YW5jZVByb3h5Lm1tOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdp bkluc3RhbmNlUHJveHk6OmV2YWx1YXRlKToKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVn aW5JbnN0YW5jZVByb3h5OjppbnZva2UpOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdp bkluc3RhbmNlUHJveHk6Omludm9rZURlZmF1bHQpOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2Fw ZVBsdWdpbkluc3RhbmNlUHJveHk6OmNvbnN0cnVjdCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNj YXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6Z2V0UHJvcGVydHkpOgorICAgICAgICAoV2ViS2l0OjpO ZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OnNldFByb3BlcnR5KToKKyAgICAgICAgKFdlYktp dDo6TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpyZW1vdmVQcm9wZXJ0eSk6CisgICAgICAg IChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6aGFzUHJvcGVydHkpOgorICAg ICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6Omhhc01ldGhvZCk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6ZW51bWVyYXRlKToK KwogMjAxMC0wMy0xNiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9I b3N0ZWQvTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5Lm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5Lm1tCShyZXZp c2lvbiA1NjA3OSkKKysrIFdlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5J bnN0YW5jZVByb3h5Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC04MjksOCArODI5LDEwIEBAIGJvb2wg TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpldmFsdWEKICAgICByZXN1bHREYXRhID0gMDsK ICAgICByZXN1bHRMZW5ndGggPSAwOwogCi0gICAgaWYgKCFtX2xvY2FsT2JqZWN0cy5jb250YWlu cyhvYmplY3RJRCkpCisgICAgaWYgKCFtX2xvY2FsT2JqZWN0cy5jb250YWlucyhvYmplY3RJRCkp IHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OmV2YWx1 YXRlOiBsb2NhbCBvYmplY3QgJXUgZG9lc24ndCBleGlzdC4iLCBvYmplY3RJRCk7CiAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKFttX3BsdWdp blZpZXcgd2ViRnJhbWVdKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtODcyLDggKzg3NCwxMCBAQCBi b29sIE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6aW52b2tlCiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICAKICAgICBKU09iamVjdCogb2JqZWN0ID0gbV9sb2NhbE9iamVjdHMuZ2V0KG9i amVjdElEKTsKLSAgICBpZiAoIW9iamVjdCkKKyAgICBpZiAoIW9iamVjdCkgeworICAgICAgICBM T0dfRVJST1IoIk5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6aW52b2tlOiBsb2NhbCBvYmpl Y3QgJXUgZG9lc24ndCBleGlzdC4iLCBvYmplY3RJRCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICB9CiAgICAgCiAgICAgRnJhbWUqIGZyYW1lID0gY29yZShbbV9wbHVnaW5WaWV3IHdlYkZy YW1lXSk7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTkwNiw4ICs5MTAsMTAgQEAgYm9vbCBOZXRzY2Fw ZVBsdWdpbkluc3RhbmNlUHJveHk6Omludm9rZQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICBKU09iamVjdCogb2JqZWN0ID0gbV9sb2NhbE9iamVjdHMuZ2V0KG9iamVjdElEKTsKLSAgICBp ZiAoIW9iamVjdCkKKyAgICBpZiAoIW9iamVjdCkgeworICAgICAgICBMT0dfRVJST1IoIk5ldHNj YXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6aW52b2tlRGVmYXVsdDogbG9jYWwgb2JqZWN0ICV1IGRv ZXNuJ3QgZXhpc3QuIiwgb2JqZWN0SUQpOwogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQog ICAgIAogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoW21fcGx1Z2luVmlldyB3ZWJGcmFtZV0pOwog ICAgIGlmICghZnJhbWUpCkBAIC05MzksOCArOTQ1LDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5J bnN0YW5jZVByb3h5Ojpjb25zdHIKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmpl Y3QqIG9iamVjdCA9IG1fbG9jYWxPYmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmpl Y3QpCisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdp bkluc3RhbmNlUHJveHk6OmNvbnN0cnVjdDogbG9jYWwgb2JqZWN0ICV1IGRvZXNuJ3QgZXhpc3Qu Iiwgb2JqZWN0SUQpOwogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogICAgIAogICAgIEZy YW1lKiBmcmFtZSA9IGNvcmUoW21fcGx1Z2luVmlldyB3ZWJGcmFtZV0pOwogICAgIGlmICghZnJh bWUpCkBAIC05NzMsOCArOTgxLDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5 OjpnZXRQcm8KICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVjdCA9 IG1fbG9jYWxPYmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAgaWYg KCFvYmplY3QpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJv eHk6OmdldFByb3BlcnR5OiBsb2NhbCBvYmplY3QgJXUgZG9lc24ndCBleGlzdC4iLCBvYmplY3RJ RCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAgICAgCiAgICAgRnJhbWUqIGZyYW1l ID0gY29yZShbbV9wbHVnaW5WaWV3IHdlYkZyYW1lXSk7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTk5 Miw4ICsxMDAyLDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpnZXRQcm8K IGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpnZXRQcm9wZXJ0eSh1aW50MzJfdCBv YmplY3RJRCwgdW5zaWduZWQgcHJvcGVydHlOYW1lLCBkYXRhX3QmIHJlc3VsdERhdGEsIG1hY2hf bXNnX3R5cGVfbnVtYmVyX3QmIHJlc3VsdExlbmd0aCkKIHsKICAgICBKU09iamVjdCogb2JqZWN0 ID0gbV9sb2NhbE9iamVjdHMuZ2V0KG9iamVjdElEKTsKLSAgICBpZiAoIW9iamVjdCkKKyAgICBp ZiAoIW9iamVjdCkgeworICAgICAgICBMT0dfRVJST1IoIk5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQ cm94eTo6Z2V0UHJvcGVydHk6IGxvY2FsIG9iamVjdCAldSBkb2Vzbid0IGV4aXN0LiIsIG9iamVj dElEKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAgICAKICAgICBGcmFtZSogZnJh bWUgPSBjb3JlKFttX3BsdWdpblZpZXcgd2ViRnJhbWVdKTsKICAgICBpZiAoIWZyYW1lKQpAQCAt MTAxNCw4ICsxMDI2LDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpzZXRQ cm8KICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVjdCA9IG1fbG9j YWxPYmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAgaWYgKCFvYmpl Y3QpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OnNl dFByb3BlcnR5OiBsb2NhbCBvYmplY3QgJXUgZG9lc24ndCBleGlzdC4iLCBvYmplY3RJRCk7CiAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAgICAgCiAgICAgRnJhbWUqIGZyYW1lID0gY29y ZShbbV9wbHVnaW5WaWV3IHdlYkZyYW1lXSk7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTEwMzgsOCAr MTA1MiwxMCBAQCBib29sIE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6c2V0UHJvCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAogICAgIEpTT2JqZWN0KiBvYmplY3QgPSBtX2xvY2FsT2JqZWN0 cy5nZXQob2JqZWN0SUQpOwotICAgIGlmICghb2JqZWN0KQorICAgIGlmICghb2JqZWN0KSB7Cisg ICAgICAgIExPR19FUlJPUigiTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpzZXRQcm9wZXJ0 eTogbG9jYWwgb2JqZWN0ICV1IGRvZXNuJ3QgZXhpc3QuIiwgb2JqZWN0SUQpOwogICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgfQogICAgIAogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoW21fcGx1 Z2luVmlldyB3ZWJGcmFtZV0pOwogICAgIGlmICghZnJhbWUpCkBAIC0xMDYxLDggKzEwNzcsMTAg QEAgYm9vbCBOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OnJlbW92ZQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKICAgICBKU09iamVjdCogb2JqZWN0ID0gbV9sb2NhbE9iamVjdHMuZ2V0KG9i amVjdElEKTsKLSAgICBpZiAoIW9iamVjdCkKKyAgICBpZiAoIW9iamVjdCkgeworICAgICAgICBM T0dfRVJST1IoIk5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6cmVtb3ZlUHJvcGVydHk6IGxv Y2FsIG9iamVjdCAldSBkb2Vzbid0IGV4aXN0LiIsIG9iamVjdElEKTsKICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIH0KICAgICAKICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKFttX3BsdWdpblZp ZXcgd2ViRnJhbWVdKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtMTA4Niw4ICsxMTA0LDEwIEBAIGJv b2wgTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpyZW1vdmUKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgSlNPYmplY3QqIG9iamVjdCA9IG1fbG9jYWxPYmplY3RzLmdldChvYmplY3RJ RCk7Ci0gICAgaWYgKCFvYmplY3QpCisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAgICAgTE9HX0VS Uk9SKCJOZXRzY2FwZVBsdWdpbkluc3RhbmNlUHJveHk6OnJlbW92ZVByb3BlcnR5OiBsb2NhbCBv YmplY3QgJXUgZG9lc24ndCBleGlzdC4iLCBvYmplY3RJRCk7CiAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICB9CiAgICAgCiAgICAgRnJhbWUqIGZyYW1lID0gY29yZShbbV9wbHVnaW5WaWV3IHdl YkZyYW1lXSk7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTExMTEsOCArMTEzMSwxMCBAQCBib29sIE5l dHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6aGFzUHJvCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIEpTT2JqZWN0KiBvYmplY3QgPSBtX2xvY2FsT2JqZWN0cy5nZXQob2JqZWN0SUQpOwot ICAgIGlmICghb2JqZWN0KQorICAgIGlmICghb2JqZWN0KSB7CisgICAgICAgIExPR19FUlJPUigi TmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5OjpoYXNQcm9wZXJ0eTogbG9jYWwgb2JqZWN0ICV1 IGRvZXNuJ3QgZXhpc3QuIiwgb2JqZWN0SUQpOwogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg fQogICAgIAogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoW21fcGx1Z2luVmlldyB3ZWJGcmFtZV0p OwogICAgIGlmICghZnJhbWUpCkBAIC0xMTMxLDggKzExNTMsMTAgQEAgYm9vbCBOZXRzY2FwZVBs dWdpbkluc3RhbmNlUHJveHk6Omhhc1BybwogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBK U09iamVjdCogb2JqZWN0ID0gbV9sb2NhbE9iamVjdHMuZ2V0KG9iamVjdElEKTsKLSAgICBpZiAo IW9iamVjdCkKKyAgICBpZiAoIW9iamVjdCkgeworICAgICAgICBMT0dfRVJST1IoIk5ldHNjYXBl UGx1Z2luSW5zdGFuY2VQcm94eTo6aGFzUHJvcGVydHk6IGxvY2FsIG9iamVjdCAldSBkb2Vzbid0 IGV4aXN0LiIsIG9iamVjdElEKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAgICAK ICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKFttX3BsdWdpblZpZXcgd2ViRnJhbWVdKTsKICAgICBp ZiAoIWZyYW1lKQpAQCAtMTE1MSw4ICsxMTc1LDEwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5JbnN0 YW5jZVByb3h5OjpoYXNNZXQKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNPYmplY3Qq IG9iamVjdCA9IG1fbG9jYWxPYmplY3RzLmdldChvYmplY3RJRCk7Ci0gICAgaWYgKCFvYmplY3Qp CisgICAgaWYgKCFvYmplY3QpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJOZXRzY2FwZVBsdWdpbklu c3RhbmNlUHJveHk6Omhhc01ldGhvZDogbG9jYWwgb2JqZWN0ICV1IGRvZXNuJ3QgZXhpc3QuIiwg b2JqZWN0SUQpOwogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogCiAgICAgRnJhbWUqIGZy YW1lID0gY29yZShbbV9wbHVnaW5WaWV3IHdlYkZyYW1lXSk7CiAgICAgaWYgKCFmcmFtZSkKQEAg LTExNzEsOCArMTE5NywxMCBAQCBib29sIE5ldHNjYXBlUGx1Z2luSW5zdGFuY2VQcm94eTo6ZW51 bWVyCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIEpTT2JqZWN0KiBvYmplY3QgPSBtX2xv Y2FsT2JqZWN0cy5nZXQob2JqZWN0SUQpOwotICAgIGlmICghb2JqZWN0KQorICAgIGlmICghb2Jq ZWN0KSB7CisgICAgICAgIExPR19FUlJPUigiTmV0c2NhcGVQbHVnaW5JbnN0YW5jZVByb3h5Ojpl bnVtZXJhdGU6IGxvY2FsIG9iamVjdCAldSBkb2Vzbid0IGV4aXN0LiIsIG9iamVjdElEKTsKICAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAgICAKICAgICBGcmFtZSogZnJhbWUgPSBjb3Jl KFttX3BsdWdpblZpZXcgd2ViRnJhbWVdKTsKICAgICBpZiAoIWZyYW1lKQo=