40869 2010-06-18 17:28:25 -0700 Change some WebPluginDabase ivars to use WebCore::String instead of NSString. 2010-06-20 13:28:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth eric webkit.review.bot oldest_to_newest 240228 0 andersca 2010-06-18 17:28:25 -0700 Change some WebPluginDabase ivars to use WebCore::String instead of NSString. 240229 1 59171 andersca 2010-06-18 17:29:31 -0700 Created attachment 59171 Patch 240230 2 59171 sam 2010-06-18 17:32:07 -0700 Comment on attachment 59171 Patch r=me 240231 3 andersca 2010-06-18 17:35:22 -0700 Committed r61459: <http://trac.webkit.org/changeset/61459> 240248 4 abarth 2010-06-18 20:19:45 -0700 Might this have caused these tests to start timing out on Tiger? dom/html/level2/html/AppletsCollection.html plugins/qt-qwidget-plugin.html 240252 5 abarth 2010-06-18 20:26:04 -0700 Hum... It's 8:30 on a Friday and I don't see you on IRC. I'm going to try rolling this out to see if it fixes the problem. 240254 6 abarth 2010-06-18 20:36:08 -0700 Rolled out in http://trac.webkit.org/changeset/61464 240256 7 59171 abarth 2010-06-18 20:36:32 -0700 Comment on attachment 59171 Patch Clearing Sam's r+ 240265 8 webkit.review.bot 2010-06-18 21:12:25 -0700 http://trac.webkit.org/changeset/61464 might have broken SnowLeopard Intel Release (Tests) 240274 9 webkit.review.bot 2010-06-18 22:27:31 -0700 http://trac.webkit.org/changeset/61459 might have broken Leopard Intel Debug (Tests) The following changes are on the blame list: http://trac.webkit.org/changeset/61458 http://trac.webkit.org/changeset/61459 240516 10 59212 andersca 2010-06-20 13:18:03 -0700 Created attachment 59212 Patch 240518 11 andersca 2010-06-20 13:28:10 -0700 Committed r61509: <http://trac.webkit.org/changeset/61509> 59171 2010-06-18 17:29:31 -0700 2010-06-20 13:18:00 -0700 Patch bug-40869-20100618172930.patch text/plain 10488 andersca SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2MTQ1OCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTAtMDYtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBDaGFuZ2Ugc29tZSBXZWJQbHVnaW5EYWJhc2UgaXZhcnMgdG8gdXNlIFdlYkNv cmU6OlN0cmluZyBpbnN0ZWFkIG9mIE5TU3RyaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA4NjkKKworICAgICAgICAqIFBsdWdpbnMvSG9zdGVk L05ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXIubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBl UGx1Z2luSG9zdE1hbmFnZXI6OnNwYXduUGx1Z2luSG9zdCk6CisgICAgICAgICogUGx1Z2lucy9X ZWJCYXNlUGx1Z2luUGFja2FnZS5oOgorICAgICAgICAqIFBsdWdpbnMvV2ViQmFzZVBsdWdpblBh Y2thZ2UubW06CisgICAgICAgICgtW1dlYkJhc2VQbHVnaW5QYWNrYWdlIGluaXRXaXRoUGF0aDpd KToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2thZ2UgZ2V0UGx1Z2luSW5mb0Zyb21QTGlz dHNdKToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2thZ2UgZGVhbGxvY10pOgorICAgICAg ICAoLVtXZWJCYXNlUGx1Z2luUGFja2FnZSBuYW1lXSk6CisgICAgICAgICgtW1dlYkJhc2VQbHVn aW5QYWNrYWdlIHBhdGhdKToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2thZ2UgZmlsZW5h bWVdKToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2thZ2UgcGx1Z2luRGVzY3JpcHRpb25d KToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2thZ2UgZGVzY3JpcHRpb25dKToKKyAgICAg ICAgKC1bV2ViQmFzZVBsdWdpblBhY2thZ2UgaXNKYXZhUGx1Z0luXSk6CisgICAgICAgICogUGx1 Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW06CisgICAgICAgICgtW1dlYk5ldHNjYXBl UGx1Z2luUGFja2FnZSBnZXRQbHVnaW5JbmZvRnJvbVJlc291cmNlc10pOgorICAgICAgICAoLVtX ZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UgX3RyeUxvYWRdKToKKyAgICAgICAgKC1bV2ViTmV0c2Nh cGVQbHVnaW5QYWNrYWdlIF91bmxvYWRXaXRoU2h1dGRvd246XSk6CisgICAgICAgICogUGx1Z2lu cy9XZWJQbHVnaW5QYWNrYWdlLm1tOgorICAgICAgICAoLVtXZWJQbHVnaW5QYWNrYWdlIGxvYWRd KToKKwogMjAxMC0wNi0xOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJLaXQvbWFjL1BsdWdp bnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1BsdWdp bnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkocmV2aXNpb24gNjE0NTYpCisrKyBXZWJLaXQvbWFj L1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMjYsNiAr MjYsOCBAQAogICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCisjaW1wb3J0IDxXZWJDb3JlL1BsdWdpbkRhdGEu aD4KKwogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogI2ltcG9ydCA8V2ViS2l0L25w ZnVuY3Rpb25zLmg+CiAjZWxzZQpAQCAtNTQsOSArNTYsOSBAQCBAaW50ZXJmYWNlIFdlYkJhc2VQ bHVnaW5QYWNrYWdlIDogTlNPYmplCiB7CiAgICAgTlNNdXRhYmxlU2V0ICpwbHVnaW5EYXRhYmFz ZXM7CiAgICAgCi0gICAgTlNTdHJpbmcgKm5hbWU7Ci0gICAgTlNTdHJpbmcgKnBhdGg7Ci0gICAg TlNTdHJpbmcgKnBsdWdpbkRlc2NyaXB0aW9uOworICAgIFdlYkNvcmU6OlN0cmluZyBuYW1lOwor ICAgIFdlYkNvcmU6OlN0cmluZyBwYXRoOworICAgIFdlYkNvcmU6OlN0cmluZyBwbHVnaW5EZXNj cmlwdGlvbjsKIAogICAgIE5TQnVuZGxlICpidW5kbGU7CiAgICAgQ0ZCdW5kbGVSZWYgY2ZCdW5k bGU7CkBAIC03NiwxMCArNzgsMTAgQEAgQGludGVyZmFjZSBXZWJCYXNlUGx1Z2luUGFja2FnZSA6 IE5TT2JqZQogLSAoQk9PTClsb2FkOwogLSAodm9pZCl1bmxvYWQ7CiAKLS0gKE5TU3RyaW5nICop bmFtZTsKLS0gKE5TU3RyaW5nICopcGF0aDsKLS0gKE5TU3RyaW5nICopZmlsZW5hbWU7Ci0tIChO U1N0cmluZyAqKXBsdWdpbkRlc2NyaXB0aW9uOworLSAoV2ViQ29yZTo6U3RyaW5nKWZpbGVuYW1l OworLSAoY29uc3QgV2ViQ29yZTo6U3RyaW5nICYpbmFtZTsKKy0gKGNvbnN0IFdlYkNvcmU6OlN0 cmluZyAmKXBhdGg7CistIChjb25zdCBXZWJDb3JlOjpTdHJpbmcgJilwbHVnaW5EZXNjcmlwdGlv bjsKIC0gKE5TQnVuZGxlICopYnVuZGxlOwogCiAtIChCT09MKXN1cHBvcnRzRXh0ZW5zaW9uOihO U1N0cmluZyAqKWV4dGVuc2lvbjsKQEAgLTkxLDkgKzkzLDYgQEAgQGludGVyZmFjZSBXZWJCYXNl UGx1Z2luUGFja2FnZSA6IE5TT2JqZQogLSAoTlNTdHJpbmcgKilNSU1FVHlwZUZvckV4dGVuc2lv bjooTlNTdHJpbmcgKilleHRlbnNpb247CiAtIChOU0FycmF5ICopZXh0ZW5zaW9uc0Zvck1JTUVU eXBlOihOU1N0cmluZyAqKU1JTUVUeXBlOwogCi0tICh2b2lkKXNldE5hbWU6KE5TU3RyaW5nICop dGhlTmFtZTsKLS0gKHZvaWQpc2V0UGF0aDooTlNTdHJpbmcgKil0aGVQYXRoOwotLSAodm9pZClz ZXRQbHVnaW5EZXNjcmlwdGlvbjooTlNTdHJpbmcgKilkZXNjcmlwdGlvbjsKIC0gKHZvaWQpc2V0 TUlNRVRvRGVzY3JpcHRpb25EaWN0aW9uYXJ5OihOU0RpY3Rpb25hcnkgKilNSU1FVG9EZXNjcmlw dGlvbkRpY3Rpb25hcnk7CiAtICh2b2lkKXNldE1JTUVUb0V4dGVuc2lvbnNEaWN0aW9uYXJ5OihO U0RpY3Rpb25hcnkgKilNSU1FVG9FeHRlbnNpb25zRGljdGlvbmFyeTsKIApJbmRleDogV2ViS2l0 L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbQkocmV2aXNpb24gNjE0NTYpCisr KyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW0JKHdvcmtpbmcgY29w eSkKQEAgLTQ3LDcgKzQ3LDYgQEAKICNpbXBvcnQgPG1hY2gtby9mYXQuaD4KICNpbXBvcnQgPG1h Y2gtby9sb2FkZXIuaD4KIAotCiAjZGVmaW5lIEphdmFDb2NvYVBsdWdpbklkZW50aWZpZXIgICBA ImNvbS5hcHBsZS5KYXZhUGx1Z2luQ29jb2EiCiAjZGVmaW5lIEphdmFDYXJib25QbHVnaW5JZGVu dGlmaWVyICBAImNvbS5hcHBsZS5KYXZhQXBwbGV0UGx1Z2luIgogI2RlZmluZSBKYXZhQ0ZNUGx1 Z2luRmlsZW5hbWUgICAgICAgQCJKYXZhIEFwcGxldCBQbHVnaW4gRW5hYmxlciIKQEAgLTU5LDYg KzU4LDggQEAgQGludGVyZmFjZSBOU0FycmF5IChXZWJQbHVnaW5FeHRlbnNpb25zKQogLSAoTlNB cnJheSAqKV93ZWJfbG93ZXJjYXNlU3RyaW5nczsKIEBlbmQ7CiAKK3VzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOworCiBAaW1wbGVtZW50YXRpb24gV2ViQmFzZVBsdWdpblBhY2thZ2UKIAogKyAodm9p ZClpbml0aWFsaXplCkBAIC0xMjIsNyArMTIzLDcgQEAgLSAoaWQpaW5pdFdpdGhQYXRoOihOU1N0 cmluZyAqKXBsdWdpblBhdAogICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0pKQogICAgICAg ICByZXR1cm4gbmlsOwogICAgICAgICAKLSAgICBwYXRoID0gW3BhdGhCeVJlc29sdmluZ1N5bWxp bmtzQW5kQWxpYXNlcyhwbHVnaW5QYXRoKSBjb3B5XTsKKyAgICBwYXRoID0gcGF0aEJ5UmVzb2x2 aW5nU3ltbGlua3NBbmRBbGlhc2VzKHBsdWdpblBhdGgpOwogICAgIGJ1bmRsZSA9IFtbTlNCdW5k bGUgYWxsb2NdIGluaXRXaXRoUGF0aDpwYXRoXTsKICNpZm5kZWYgX19wcGNfXwogICAgIC8vIDMy LWJpdCBQb3dlclBDIGlzIHRoZSBvbmx5IHBsYXRmb3JtIHdoZXJlIG5vbi1idW5kbGVkIENGTSBw bHVnaW5zIGFyZSBzdXBwb3J0ZWQKQEAgLTIzMywxMiArMjM0LDEyIEBAIC0gKEJPT0wpZ2V0UGx1 Z2luSW5mb0Zyb21QTGlzdHMKICAgICBOU1N0cmluZyAqdGhlTmFtZSA9IFtidW5kbGUgb2JqZWN0 Rm9ySW5mb0RpY3Rpb25hcnlLZXk6V2ViUGx1Z2luTmFtZUtleV07CiAgICAgaWYgKCF0aGVOYW1l KQogICAgICAgICB0aGVOYW1lID0gZmlsZW5hbWU7Ci0gICAgW3NlbGYgc2V0TmFtZTp0aGVOYW1l XTsKKyAgICBuYW1lID0gdGhlTmFtZTsKIAogICAgIGRlc2NyaXB0aW9uID0gW2J1bmRsZSBvYmpl Y3RGb3JJbmZvRGljdGlvbmFyeUtleTpXZWJQbHVnaW5EZXNjcmlwdGlvbktleV07CiAgICAgaWYg KCFkZXNjcmlwdGlvbikKICAgICAgICAgZGVzY3JpcHRpb24gPSBmaWxlbmFtZTsKLSAgICBbc2Vs ZiBzZXRQbHVnaW5EZXNjcmlwdGlvbjpkZXNjcmlwdGlvbl07CisgICAgcGx1Z2luRGVzY3JpcHRp b24gPSBkZXNjcmlwdGlvbjsKIAogICAgIHJldHVybiBZRVM7CiB9CkBAIC0yNTYsMTAgKzI1Nyw2 IEBAIC0gKHZvaWQpZGVhbGxvYwogICAgIEFTU0VSVCghcGx1Z2luRGF0YWJhc2VzIHx8IFtwbHVn aW5EYXRhYmFzZXMgY291bnRdID09IDApOwogICAgIFtwbHVnaW5EYXRhYmFzZXMgcmVsZWFzZV07 CiAgICAgCi0gICAgW25hbWUgcmVsZWFzZV07Ci0gICAgW3BhdGggcmVsZWFzZV07Ci0gICAgW3Bs dWdpbkRlc2NyaXB0aW9uIHJlbGVhc2VdOwotCiAgICAgW01JTUVUb0Rlc2NyaXB0aW9uIHJlbGVh c2VdOwogICAgIFtNSU1FVG9FeHRlbnNpb25zIHJlbGVhc2VdOwogICAgIFtleHRlbnNpb25Ub01J TUUgcmVsZWFzZV07CkBAIC0yODMsMjIgKzI4MCwyMiBAQCAtICh2b2lkKWZpbmFsaXplCiAgICAg W3N1cGVyIGZpbmFsaXplXTsKIH0KIAotLSAoTlNTdHJpbmcgKiluYW1lCistIChjb25zdCBTdHJp bmcmKW5hbWUKIHsKICAgICByZXR1cm4gbmFtZTsKIH0KIAotLSAoTlNTdHJpbmcgKilwYXRoCist IChjb25zdCBTdHJpbmcmKXBhdGgKIHsKICAgICByZXR1cm4gcGF0aDsKIH0KIAotLSAoTlNTdHJp bmcgKilmaWxlbmFtZQorLSAoU3RyaW5nKWZpbGVuYW1lCiB7Ci0gICAgcmV0dXJuIFtwYXRoIGxh c3RQYXRoQ29tcG9uZW50XTsKKyAgICByZXR1cm4gWyhOU1N0cmluZyAqKXBhdGggbGFzdFBhdGhD b21wb25lbnRdOwogfQogCi0tIChOU1N0cmluZyAqKXBsdWdpbkRlc2NyaXB0aW9uCistIChjb25z dCBTdHJpbmcmKXBsdWdpbkRlc2NyaXB0aW9uCiB7CiAgICAgcmV0dXJuIHBsdWdpbkRlc2NyaXB0 aW9uOwogfQpAQCAtMzM4LDI0ICszMzUsNiBAQCAtIChOU0J1bmRsZSAqKWJ1bmRsZQogICAgIHJl dHVybiBidW5kbGU7CiB9CiAKLS0gKHZvaWQpc2V0TmFtZTooTlNTdHJpbmcgKil0aGVOYW1lCi17 Ci0gICAgW25hbWUgcmVsZWFzZV07Ci0gICAgbmFtZSA9IFt0aGVOYW1lIHJldGFpbl07Ci19Ci0K LS0gKHZvaWQpc2V0UGF0aDooTlNTdHJpbmcgKil0aGVQYXRoCi17Ci0gICAgW3BhdGggcmVsZWFz ZV07Ci0gICAgcGF0aCA9IFt0aGVQYXRoIHJldGFpbl07Ci19Ci0KLS0gKHZvaWQpc2V0UGx1Z2lu RGVzY3JpcHRpb246KE5TU3RyaW5nICopZGVzY3JpcHRpb24KLXsKLSAgICBbcGx1Z2luRGVzY3Jp cHRpb24gcmVsZWFzZV07Ci0gICAgcGx1Z2luRGVzY3JpcHRpb24gPSBbZGVzY3JpcHRpb24gcmV0 YWluXTsKLX0KLQogLSAodm9pZClzZXRNSU1FVG9EZXNjcmlwdGlvbkRpY3Rpb25hcnk6KE5TRGlj dGlvbmFyeSAqKU1JTUVUb0Rlc2NyaXB0aW9uRGljdGlvbmFyeQogewogICAgIFtNSU1FVG9EZXNj cmlwdGlvbiByZWxlYXNlXTsKQEAgLTM4OCw3ICszNjcsNyBAQCAtICh2b2lkKXNldE1JTUVUb0V4 dGVuc2lvbnNEaWN0aW9uYXJ5OihOCiAtIChOU1N0cmluZyAqKWRlc2NyaXB0aW9uCiB7CiAgICAg cmV0dXJuIFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAibmFtZTogJUBcbnBhdGg6ICVAXG5t aW1lVHlwZXM6XG4lQFxucGx1Z2luRGVzY3JpcHRpb246JUAiLAotICAgICAgICBuYW1lLCBwYXRo LCBbTUlNRVRvRXh0ZW5zaW9ucyBkZXNjcmlwdGlvbl0sIFtNSU1FVG9EZXNjcmlwdGlvbiBkZXNj cmlwdGlvbl0sIHBsdWdpbkRlc2NyaXB0aW9uXTsKKyAgICAgICAgKE5TU3RyaW5nICopbmFtZSwg KE5TU3RyaW5nICopcGF0aCwgW01JTUVUb0V4dGVuc2lvbnMgZGVzY3JpcHRpb25dLCBbTUlNRVRv RGVzY3JpcHRpb24gZGVzY3JpcHRpb25dLCAoTlNTdHJpbmcgKilwbHVnaW5EZXNjcmlwdGlvbl07 CiB9CiAKIC0gKEJPT0wpaXNRdWlja1RpbWVQbHVnSW4KQEAgLTQwMyw3ICszODIsNyBAQCAtIChC T09MKWlzSmF2YVBsdWdJbgogICAgIE5TU3RyaW5nICpidW5kbGVJZGVudGlmaWVyID0gW1tzZWxm IGJ1bmRsZV0gYnVuZGxlSWRlbnRpZmllcl07CiAgICAgcmV0dXJuIFtidW5kbGVJZGVudGlmaWVy IF93ZWJraXRfaXNDYXNlSW5zZW5zaXRpdmVFcXVhbFRvU3RyaW5nOkphdmFDb2NvYVBsdWdpbklk ZW50aWZpZXJdIHx8IAogICAgICAgICBbYnVuZGxlSWRlbnRpZmllciBfd2Via2l0X2lzQ2FzZUlu c2Vuc2l0aXZlRXF1YWxUb1N0cmluZzpKYXZhQ2FyYm9uUGx1Z2luSWRlbnRpZmllcl0gfHwKLSAg ICAgICAgW1twYXRoIGxhc3RQYXRoQ29tcG9uZW50XSBfd2Via2l0X2lzQ2FzZUluc2Vuc2l0aXZl RXF1YWxUb1N0cmluZzpKYXZhQ0ZNUGx1Z2luRmlsZW5hbWVdOworICAgICAgICBbW3NlbGYgZmls ZW5hbWVdIF93ZWJraXRfaXNDYXNlSW5zZW5zaXRpdmVFcXVhbFRvU3RyaW5nOkphdmFDRk1QbHVn aW5GaWxlbmFtZV07CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBzd2FwSW50c0luSGVhZGVyKHVp bnQ4X3QqIGJ5dGVzLCB1bnNpZ25lZCBsZW5ndGgpCkluZGV4OiBXZWJLaXQvbWFjL1BsdWdpbnMv V2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvUGx1 Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW0JKHJldmlzaW9uIDYxNDU2KQorKysgV2Vi S2l0L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZS5tbQkod29ya2luZyBjb3B5 KQpAQCAtMTg5LDEzICsxODksMTMgQEAgLSAoQk9PTClnZXRQbHVnaW5JbmZvRnJvbVJlc291cmNl cwogICAgIGRlc2NyaXB0aW9uID0gW3NlbGYgc3RyaW5nRm9yU3RyaW5nTGlzdElEOlBsdWdpbk5h bWVPckRlc2NyaXB0aW9uU3RyaW5nTnVtYmVyIGFuZEluZGV4OjFdOwogICAgIGlmICghZGVzY3Jp cHRpb24pCiAgICAgICAgIGRlc2NyaXB0aW9uID0gZmlsZW5hbWU7Ci0gICAgW3NlbGYgc2V0UGx1 Z2luRGVzY3JpcHRpb246ZGVzY3JpcHRpb25dOworICAgIHBsdWdpbkRlc2NyaXB0aW9uID0gZGVz Y3JpcHRpb247CiAgICAgCiAgICAgCiAgICAgTlNTdHJpbmcgKnRoZU5hbWUgPSBbc2VsZiBzdHJp bmdGb3JTdHJpbmdMaXN0SUQ6UGx1Z2luTmFtZU9yRGVzY3JpcHRpb25TdHJpbmdOdW1iZXIgYW5k SW5kZXg6Ml07CiAgICAgaWYgKCF0aGVOYW1lKQogICAgICAgICB0aGVOYW1lID0gZmlsZW5hbWU7 Ci0gICAgW3NlbGYgc2V0TmFtZTp0aGVOYW1lXTsKKyAgICBuYW1lID0gdGhlTmFtZTsKICAgICAK ICAgICBbc2VsZiBjbG9zZVJlc291cmNlRmlsZTpyZXNSZWZdOwogICAgIApAQCAtMzUyLDcgKzM1 Miw3IEBAIC0gKEJPT0wpX3RyeUxvYWQKICAgICBDRkFic29sdXRlVGltZSBjdXJyZW50VGltZTsK ICAgICBDRkFic29sdXRlVGltZSBkdXJhdGlvbjsKICNlbmRpZgotICAgIExPRyhQbHVnaW5zLCAi JWYgTG9hZCB0aW1pbmcgc3RhcnRlZCBmb3I6ICVAIiwgc3RhcnQsIFtzZWxmIG5hbWVdKTsKKyAg ICBMT0coUGx1Z2lucywgIiVmIExvYWQgdGltaW5nIHN0YXJ0ZWQgZm9yOiAlQCIsIHN0YXJ0LCAo TlNTdHJpbmcgKilbc2VsZiBuYW1lXSk7CiAKICAgICBpZiAoaXNMb2FkZWQpCiAgICAgICAgIHJl dHVybiBZRVM7CkBAIC02MjUsOSArNjI1LDkgQEAgLSAoQk9PTClfdHJ5TG9hZAogICAgICAgICBw bHVnaW5WZXJzaW9uID0gcGx1Z2luRnVuY3MudmVyc2lvbjsKICAgICAgICAgCiAgICAgICAgIGlm IChwbHVnaW5GdW5jcy5qYXZhQ2xhc3MpCi0gICAgICAgICAgICBMT0coTGl2ZUNvbm5lY3QsICIl QDogIG1hY2gtbyBlbnRyeSBwb2ludCBmb3IgTlBQX0dldEphdmFDbGFzcyA9ICVwIiwgW3NlbGYg bmFtZV0sIHBsdWdpbkZ1bmNzLmphdmFDbGFzcyk7CisgICAgICAgICAgICBMT0coTGl2ZUNvbm5l Y3QsICIlQDogIG1hY2gtbyBlbnRyeSBwb2ludCBmb3IgTlBQX0dldEphdmFDbGFzcyA9ICVwIiwg KE5TU3RyaW5nICopW3NlbGYgbmFtZV0sIHBsdWdpbkZ1bmNzLmphdmFDbGFzcyk7CiAgICAgICAg IGVsc2UKLSAgICAgICAgICAgIExPRyhMaXZlQ29ubmVjdCwgIiVAOiAgbm8gZW50cnkgcG9pbnQg Zm9yIE5QUF9HZXRKYXZhQ2xhc3MiLCBbc2VsZiBuYW1lXSk7CisgICAgICAgICAgICBMT0coTGl2 ZUNvbm5lY3QsICIlQDogIG5vIGVudHJ5IHBvaW50IGZvciBOUFBfR2V0SmF2YUNsYXNzIiwgKE5T U3RyaW5nICopW3NlbGYgbmFtZV0pOwogCiAjaWZkZWYgU1VQUE9SVF9DRk0KICAgICB9CkBAIC03 MzYsNyArNzM2LDcgQEAgLSAodm9pZClfdW5sb2FkV2l0aFNodXRkb3duOihCT09MKXNodXRkbwog ICAgIGlmICghaXNMb2FkZWQpCiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBMT0coUGx1Z2lu cywgIlVubG9hZGluZyAlQC4uLiIsIG5hbWUpOworICAgIExPRyhQbHVnaW5zLCAiVW5sb2FkaW5n ICVALi4uIiwgKE5TU3RyaW5nICopbmFtZSk7CiAKICAgICAvLyBDYW5ub3QgdW5sb2FkIGEgcGx1 Zy1pbiBwYWNrYWdlIHdoaWxlIGFuIGluc3RhbmNlIGlzIHN0aWxsIHVzaW5nIGl0CiAgICAgaWYg KGluc3RhbmNlQ291bnQgPiAwKSB7CkluZGV4OiBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2lu UGFja2FnZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2luUGFj a2FnZS5tbQkocmV2aXNpb24gNjE0NTYpCisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2lu UGFja2FnZS5tbQkod29ya2luZyBjb3B5KQpAQCAtOTQsNyArOTQsNyBAQCAtIChCT09MKWxvYWQK ICAgICAKICNpZiAhTE9HX0RJU0FCTEVECiAgICAgQ0ZBYnNvbHV0ZVRpbWUgZHVyYXRpb24gPSBD RkFic29sdXRlVGltZUdldEN1cnJlbnQoKSAtIHN0YXJ0OwotICAgIExPRyhQbHVnaW5zLCAicHJp bmNpcGFsQ2xhc3MgdG9vayAlZiBzZWNvbmRzIGZvcjogJUAiLCBkdXJhdGlvbiwgW3NlbGYgbmFt ZV0pOworICAgIExPRyhQbHVnaW5zLCAicHJpbmNpcGFsQ2xhc3MgdG9vayAlZiBzZWNvbmRzIGZv cjogJUAiLCBkdXJhdGlvbiwgKE5TU3RyaW5nICopW3NlbGYgbmFtZV0pOwogI2VuZGlmCiAgICAg cmV0dXJuIFtzdXBlciBsb2FkXTsKIH0KSW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9Ib3N0ZWQv TmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1Bs dWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9zdE1hbmFnZXIubW0JKHJldmlzaW9uIDYxNDU2 KQorKysgV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2Vy Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNTYsNyArMTU2LDcgQEAgYm9vbCBOZXRzY2FwZVBsdWdp bkhvc3RNYW5hZ2VyOjpzcGF3blBsdQogICAgIAogICAgIE5TRGljdGlvbmFyeSAqaG9zdFByb3Bl cnRpZXMgPSBbW05TRGljdGlvbmFyeSBhbGxvY10gaW5pdFdpdGhPYmplY3RzQW5kS2V5czoKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZpc2libGVOYW1lLCBAInZpc2libGVO YW1lIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFtwYWNrYWdlIHBhdGhd LCBAImJ1bmRsZVBhdGgiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKE5T U3RyaW5nICopW3BhY2thZ2UgcGF0aF0sIEAiYnVuZGxlUGF0aCIsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBuaWxdOwogICAgIAogICAgIGRhdGEgPSBbTlNQcm9wZXJ0eUxp c3RTZXJpYWxpemF0aW9uIGRhdGFGcm9tUHJvcGVydHlMaXN0Omhvc3RQcm9wZXJ0aWVzIGZvcm1h dDpOU1Byb3BlcnR5TGlzdEJpbmFyeUZvcm1hdF92MV8wIGVycm9yRGVzY3JpcHRpb246bmlsXTsK 59212 2010-06-20 13:18:03 -0700 2010-06-20 13:22:59 -0700 Patch bug-40869-20100620131802.patch text/plain 13007 andersca SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2MTUwOCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTAtMDYtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBDaGFuZ2Ugc29tZSBXZWJQbHVnaW5EYWJhc2UgaXZhcnMgdG8gdXNlIFdlYkNv cmU6OlN0cmluZyBpbnN0ZWFkIG9mIE5TU3RyaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA4NjkKKyAgICAgICAgCisgICAgICAgIFJlLWxhbmQg cjYxNDU5LCB3aXRoIGV4dHJhIG51bGwtY2hlY2tzIGluIFdlYkZyYW1lTG9hZGVyQ2xpZW50Lgor CisgICAgICAgICogUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5tbToK KyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlcjo6c3Bhd25QbHVnaW5I b3N0KToKKyAgICAgICAgKiBQbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLmg6CisgICAgICAg ICogUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbToKKyAgICAgICAgKC1bV2ViQmFzZVBs dWdpblBhY2thZ2UgaW5pdFdpdGhQYXRoOl0pOgorICAgICAgICAoLVtXZWJCYXNlUGx1Z2luUGFj a2FnZSBnZXRQbHVnaW5JbmZvRnJvbVBMaXN0c10pOgorICAgICAgICAoLVtXZWJCYXNlUGx1Z2lu UGFja2FnZSBkZWFsbG9jXSk6CisgICAgICAgICgtW1dlYkJhc2VQbHVnaW5QYWNrYWdlIG5hbWVd KToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2thZ2UgcGF0aF0pOgorICAgICAgICAoLVtX ZWJCYXNlUGx1Z2luUGFja2FnZSBmaWxlbmFtZV0pOgorICAgICAgICAoLVtXZWJCYXNlUGx1Z2lu UGFja2FnZSBwbHVnaW5EZXNjcmlwdGlvbl0pOgorICAgICAgICAoLVtXZWJCYXNlUGx1Z2luUGFj a2FnZSBkZXNjcmlwdGlvbl0pOgorICAgICAgICAoLVtXZWJCYXNlUGx1Z2luUGFja2FnZSBpc0ph dmFQbHVnSW5dKToKKyAgICAgICAgKiBQbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZS5t bToKKyAgICAgICAgKC1bV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlIGdldFBsdWdpbkluZm9Gcm9t UmVzb3VyY2VzXSk6CisgICAgICAgICgtW1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZSBfdHJ5TG9h ZF0pOgorICAgICAgICAoLVtXZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UgX3VubG9hZFdpdGhTaHV0 ZG93bjpdKToKKyAgICAgICAgKiBQbHVnaW5zL1dlYlBsdWdpblBhY2thZ2UubW06CisgICAgICAg ICgtW1dlYlBsdWdpblBhY2thZ2UgbG9hZF0pOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50Lm1tOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNy ZWF0ZVBsdWdpbik6CisKIDIwMTAtMDYtMTggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNjE0NTkuCkluZGV4OiBXZWJL aXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkocmV2aXNpb24gNjE1MDgpCisr KyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkod29ya2luZyBjb3B5 KQpAQCAtMjYsNiArMjYsOCBAQAogICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCisjaW1wb3J0IDxXZWJDb3Jl L1BsdWdpbkRhdGEuaD4KKwogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogI2ltcG9y dCA8V2ViS2l0L25wZnVuY3Rpb25zLmg+CiAjZWxzZQpAQCAtNTQsOSArNTYsOSBAQCBAaW50ZXJm YWNlIFdlYkJhc2VQbHVnaW5QYWNrYWdlIDogTlNPYmplCiB7CiAgICAgTlNNdXRhYmxlU2V0ICpw bHVnaW5EYXRhYmFzZXM7CiAgICAgCi0gICAgTlNTdHJpbmcgKm5hbWU7Ci0gICAgTlNTdHJpbmcg KnBhdGg7Ci0gICAgTlNTdHJpbmcgKnBsdWdpbkRlc2NyaXB0aW9uOworICAgIFdlYkNvcmU6OlN0 cmluZyBuYW1lOworICAgIFdlYkNvcmU6OlN0cmluZyBwYXRoOworICAgIFdlYkNvcmU6OlN0cmlu ZyBwbHVnaW5EZXNjcmlwdGlvbjsKIAogICAgIE5TQnVuZGxlICpidW5kbGU7CiAgICAgQ0ZCdW5k bGVSZWYgY2ZCdW5kbGU7CkBAIC03NiwxMCArNzgsMTAgQEAgQGludGVyZmFjZSBXZWJCYXNlUGx1 Z2luUGFja2FnZSA6IE5TT2JqZQogLSAoQk9PTClsb2FkOwogLSAodm9pZCl1bmxvYWQ7CiAKLS0g KE5TU3RyaW5nICopbmFtZTsKLS0gKE5TU3RyaW5nICopcGF0aDsKLS0gKE5TU3RyaW5nICopZmls ZW5hbWU7Ci0tIChOU1N0cmluZyAqKXBsdWdpbkRlc2NyaXB0aW9uOworLSAoV2ViQ29yZTo6U3Ry aW5nKWZpbGVuYW1lOworLSAoY29uc3QgV2ViQ29yZTo6U3RyaW5nJiluYW1lOworLSAoY29uc3Qg V2ViQ29yZTo6U3RyaW5nJilwYXRoOworLSAoY29uc3QgV2ViQ29yZTo6U3RyaW5nJilwbHVnaW5E ZXNjcmlwdGlvbjsKIC0gKE5TQnVuZGxlICopYnVuZGxlOwogCiAtIChCT09MKXN1cHBvcnRzRXh0 ZW5zaW9uOihOU1N0cmluZyAqKWV4dGVuc2lvbjsKQEAgLTkxLDkgKzkzLDYgQEAgQGludGVyZmFj ZSBXZWJCYXNlUGx1Z2luUGFja2FnZSA6IE5TT2JqZQogLSAoTlNTdHJpbmcgKilNSU1FVHlwZUZv ckV4dGVuc2lvbjooTlNTdHJpbmcgKilleHRlbnNpb247CiAtIChOU0FycmF5ICopZXh0ZW5zaW9u c0Zvck1JTUVUeXBlOihOU1N0cmluZyAqKU1JTUVUeXBlOwogCi0tICh2b2lkKXNldE5hbWU6KE5T U3RyaW5nICopdGhlTmFtZTsKLS0gKHZvaWQpc2V0UGF0aDooTlNTdHJpbmcgKil0aGVQYXRoOwot LSAodm9pZClzZXRQbHVnaW5EZXNjcmlwdGlvbjooTlNTdHJpbmcgKilkZXNjcmlwdGlvbjsKIC0g KHZvaWQpc2V0TUlNRVRvRGVzY3JpcHRpb25EaWN0aW9uYXJ5OihOU0RpY3Rpb25hcnkgKilNSU1F VG9EZXNjcmlwdGlvbkRpY3Rpb25hcnk7CiAtICh2b2lkKXNldE1JTUVUb0V4dGVuc2lvbnNEaWN0 aW9uYXJ5OihOU0RpY3Rpb25hcnkgKilNSU1FVG9FeHRlbnNpb25zRGljdGlvbmFyeTsKIApJbmRl eDogV2ViS2l0L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbQkocmV2aXNpb24g NjE1MDgpCisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW0JKHdv cmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDYgQEAKICNpbXBvcnQgPG1hY2gtby9mYXQuaD4KICNp bXBvcnQgPG1hY2gtby9sb2FkZXIuaD4KIAotCiAjZGVmaW5lIEphdmFDb2NvYVBsdWdpbklkZW50 aWZpZXIgICBAImNvbS5hcHBsZS5KYXZhUGx1Z2luQ29jb2EiCiAjZGVmaW5lIEphdmFDYXJib25Q bHVnaW5JZGVudGlmaWVyICBAImNvbS5hcHBsZS5KYXZhQXBwbGV0UGx1Z2luIgogI2RlZmluZSBK YXZhQ0ZNUGx1Z2luRmlsZW5hbWUgICAgICAgQCJKYXZhIEFwcGxldCBQbHVnaW4gRW5hYmxlciIK QEAgLTU5LDYgKzU4LDggQEAgQGludGVyZmFjZSBOU0FycmF5IChXZWJQbHVnaW5FeHRlbnNpb25z KQogLSAoTlNBcnJheSAqKV93ZWJfbG93ZXJjYXNlU3RyaW5nczsKIEBlbmQ7CiAKK3VzaW5nIG5h bWVzcGFjZSBXZWJDb3JlOworCiBAaW1wbGVtZW50YXRpb24gV2ViQmFzZVBsdWdpblBhY2thZ2UK IAogKyAodm9pZClpbml0aWFsaXplCkBAIC0xMjIsNyArMTIzLDcgQEAgLSAoaWQpaW5pdFdpdGhQ YXRoOihOU1N0cmluZyAqKXBsdWdpblBhdAogICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0p KQogICAgICAgICByZXR1cm4gbmlsOwogICAgICAgICAKLSAgICBwYXRoID0gW3BhdGhCeVJlc29s dmluZ1N5bWxpbmtzQW5kQWxpYXNlcyhwbHVnaW5QYXRoKSBjb3B5XTsKKyAgICBwYXRoID0gcGF0 aEJ5UmVzb2x2aW5nU3ltbGlua3NBbmRBbGlhc2VzKHBsdWdpblBhdGgpOwogICAgIGJ1bmRsZSA9 IFtbTlNCdW5kbGUgYWxsb2NdIGluaXRXaXRoUGF0aDpwYXRoXTsKICNpZm5kZWYgX19wcGNfXwog ICAgIC8vIDMyLWJpdCBQb3dlclBDIGlzIHRoZSBvbmx5IHBsYXRmb3JtIHdoZXJlIG5vbi1idW5k bGVkIENGTSBwbHVnaW5zIGFyZSBzdXBwb3J0ZWQKQEAgLTIzMywxMiArMjM0LDEyIEBAIC0gKEJP T0wpZ2V0UGx1Z2luSW5mb0Zyb21QTGlzdHMKICAgICBOU1N0cmluZyAqdGhlTmFtZSA9IFtidW5k bGUgb2JqZWN0Rm9ySW5mb0RpY3Rpb25hcnlLZXk6V2ViUGx1Z2luTmFtZUtleV07CiAgICAgaWYg KCF0aGVOYW1lKQogICAgICAgICB0aGVOYW1lID0gZmlsZW5hbWU7Ci0gICAgW3NlbGYgc2V0TmFt ZTp0aGVOYW1lXTsKKyAgICBuYW1lID0gdGhlTmFtZTsKIAogICAgIGRlc2NyaXB0aW9uID0gW2J1 bmRsZSBvYmplY3RGb3JJbmZvRGljdGlvbmFyeUtleTpXZWJQbHVnaW5EZXNjcmlwdGlvbktleV07 CiAgICAgaWYgKCFkZXNjcmlwdGlvbikKICAgICAgICAgZGVzY3JpcHRpb24gPSBmaWxlbmFtZTsK LSAgICBbc2VsZiBzZXRQbHVnaW5EZXNjcmlwdGlvbjpkZXNjcmlwdGlvbl07CisgICAgcGx1Z2lu RGVzY3JpcHRpb24gPSBkZXNjcmlwdGlvbjsKIAogICAgIHJldHVybiBZRVM7CiB9CkBAIC0yNTYs MTAgKzI1Nyw2IEBAIC0gKHZvaWQpZGVhbGxvYwogICAgIEFTU0VSVCghcGx1Z2luRGF0YWJhc2Vz IHx8IFtwbHVnaW5EYXRhYmFzZXMgY291bnRdID09IDApOwogICAgIFtwbHVnaW5EYXRhYmFzZXMg cmVsZWFzZV07CiAgICAgCi0gICAgW25hbWUgcmVsZWFzZV07Ci0gICAgW3BhdGggcmVsZWFzZV07 Ci0gICAgW3BsdWdpbkRlc2NyaXB0aW9uIHJlbGVhc2VdOwotCiAgICAgW01JTUVUb0Rlc2NyaXB0 aW9uIHJlbGVhc2VdOwogICAgIFtNSU1FVG9FeHRlbnNpb25zIHJlbGVhc2VdOwogICAgIFtleHRl bnNpb25Ub01JTUUgcmVsZWFzZV07CkBAIC0yODMsMjIgKzI4MCwyMiBAQCAtICh2b2lkKWZpbmFs aXplCiAgICAgW3N1cGVyIGZpbmFsaXplXTsKIH0KIAotLSAoTlNTdHJpbmcgKiluYW1lCistIChj b25zdCBTdHJpbmcmKW5hbWUKIHsKICAgICByZXR1cm4gbmFtZTsKIH0KIAotLSAoTlNTdHJpbmcg KilwYXRoCistIChjb25zdCBTdHJpbmcmKXBhdGgKIHsKICAgICByZXR1cm4gcGF0aDsKIH0KIAot LSAoTlNTdHJpbmcgKilmaWxlbmFtZQorLSAoU3RyaW5nKWZpbGVuYW1lCiB7Ci0gICAgcmV0dXJu IFtwYXRoIGxhc3RQYXRoQ29tcG9uZW50XTsKKyAgICByZXR1cm4gWyhOU1N0cmluZyAqKXBhdGgg bGFzdFBhdGhDb21wb25lbnRdOwogfQogCi0tIChOU1N0cmluZyAqKXBsdWdpbkRlc2NyaXB0aW9u CistIChjb25zdCBTdHJpbmcmKXBsdWdpbkRlc2NyaXB0aW9uCiB7CiAgICAgcmV0dXJuIHBsdWdp bkRlc2NyaXB0aW9uOwogfQpAQCAtMzM4LDI0ICszMzUsNiBAQCAtIChOU0J1bmRsZSAqKWJ1bmRs ZQogICAgIHJldHVybiBidW5kbGU7CiB9CiAKLS0gKHZvaWQpc2V0TmFtZTooTlNTdHJpbmcgKil0 aGVOYW1lCi17Ci0gICAgW25hbWUgcmVsZWFzZV07Ci0gICAgbmFtZSA9IFt0aGVOYW1lIHJldGFp bl07Ci19Ci0KLS0gKHZvaWQpc2V0UGF0aDooTlNTdHJpbmcgKil0aGVQYXRoCi17Ci0gICAgW3Bh dGggcmVsZWFzZV07Ci0gICAgcGF0aCA9IFt0aGVQYXRoIHJldGFpbl07Ci19Ci0KLS0gKHZvaWQp c2V0UGx1Z2luRGVzY3JpcHRpb246KE5TU3RyaW5nICopZGVzY3JpcHRpb24KLXsKLSAgICBbcGx1 Z2luRGVzY3JpcHRpb24gcmVsZWFzZV07Ci0gICAgcGx1Z2luRGVzY3JpcHRpb24gPSBbZGVzY3Jp cHRpb24gcmV0YWluXTsKLX0KLQogLSAodm9pZClzZXRNSU1FVG9EZXNjcmlwdGlvbkRpY3Rpb25h cnk6KE5TRGljdGlvbmFyeSAqKU1JTUVUb0Rlc2NyaXB0aW9uRGljdGlvbmFyeQogewogICAgIFtN SU1FVG9EZXNjcmlwdGlvbiByZWxlYXNlXTsKQEAgLTM4OCw3ICszNjcsNyBAQCAtICh2b2lkKXNl dE1JTUVUb0V4dGVuc2lvbnNEaWN0aW9uYXJ5OihOCiAtIChOU1N0cmluZyAqKWRlc2NyaXB0aW9u CiB7CiAgICAgcmV0dXJuIFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAibmFtZTogJUBcbnBh dGg6ICVAXG5taW1lVHlwZXM6XG4lQFxucGx1Z2luRGVzY3JpcHRpb246JUAiLAotICAgICAgICBu YW1lLCBwYXRoLCBbTUlNRVRvRXh0ZW5zaW9ucyBkZXNjcmlwdGlvbl0sIFtNSU1FVG9EZXNjcmlw dGlvbiBkZXNjcmlwdGlvbl0sIHBsdWdpbkRlc2NyaXB0aW9uXTsKKyAgICAgICAgKE5TU3RyaW5n ICopbmFtZSwgKE5TU3RyaW5nICopcGF0aCwgW01JTUVUb0V4dGVuc2lvbnMgZGVzY3JpcHRpb25d LCBbTUlNRVRvRGVzY3JpcHRpb24gZGVzY3JpcHRpb25dLCAoTlNTdHJpbmcgKilwbHVnaW5EZXNj cmlwdGlvbl07CiB9CiAKIC0gKEJPT0wpaXNRdWlja1RpbWVQbHVnSW4KQEAgLTQwMyw3ICszODIs NyBAQCAtIChCT09MKWlzSmF2YVBsdWdJbgogICAgIE5TU3RyaW5nICpidW5kbGVJZGVudGlmaWVy ID0gW1tzZWxmIGJ1bmRsZV0gYnVuZGxlSWRlbnRpZmllcl07CiAgICAgcmV0dXJuIFtidW5kbGVJ ZGVudGlmaWVyIF93ZWJraXRfaXNDYXNlSW5zZW5zaXRpdmVFcXVhbFRvU3RyaW5nOkphdmFDb2Nv YVBsdWdpbklkZW50aWZpZXJdIHx8IAogICAgICAgICBbYnVuZGxlSWRlbnRpZmllciBfd2Via2l0 X2lzQ2FzZUluc2Vuc2l0aXZlRXF1YWxUb1N0cmluZzpKYXZhQ2FyYm9uUGx1Z2luSWRlbnRpZmll cl0gfHwKLSAgICAgICAgW1twYXRoIGxhc3RQYXRoQ29tcG9uZW50XSBfd2Via2l0X2lzQ2FzZUlu c2Vuc2l0aXZlRXF1YWxUb1N0cmluZzpKYXZhQ0ZNUGx1Z2luRmlsZW5hbWVdOworICAgICAgICBb KE5TU3RyaW5nICopW3NlbGYgZmlsZW5hbWVdIF93ZWJraXRfaXNDYXNlSW5zZW5zaXRpdmVFcXVh bFRvU3RyaW5nOkphdmFDRk1QbHVnaW5GaWxlbmFtZV07CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9p ZCBzd2FwSW50c0luSGVhZGVyKHVpbnQ4X3QqIGJ5dGVzLCB1bnNpZ25lZCBsZW5ndGgpCkluZGV4 OiBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW0JKHJl dmlzaW9uIDYxNTA4KQorKysgV2ViS2l0L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luUGFj a2FnZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTg5LDEzICsxODksMTMgQEAgLSAoQk9PTClnZXRQ bHVnaW5JbmZvRnJvbVJlc291cmNlcwogICAgIGRlc2NyaXB0aW9uID0gW3NlbGYgc3RyaW5nRm9y U3RyaW5nTGlzdElEOlBsdWdpbk5hbWVPckRlc2NyaXB0aW9uU3RyaW5nTnVtYmVyIGFuZEluZGV4 OjFdOwogICAgIGlmICghZGVzY3JpcHRpb24pCiAgICAgICAgIGRlc2NyaXB0aW9uID0gZmlsZW5h bWU7Ci0gICAgW3NlbGYgc2V0UGx1Z2luRGVzY3JpcHRpb246ZGVzY3JpcHRpb25dOworICAgIHBs dWdpbkRlc2NyaXB0aW9uID0gZGVzY3JpcHRpb247CiAgICAgCiAgICAgCiAgICAgTlNTdHJpbmcg KnRoZU5hbWUgPSBbc2VsZiBzdHJpbmdGb3JTdHJpbmdMaXN0SUQ6UGx1Z2luTmFtZU9yRGVzY3Jp cHRpb25TdHJpbmdOdW1iZXIgYW5kSW5kZXg6Ml07CiAgICAgaWYgKCF0aGVOYW1lKQogICAgICAg ICB0aGVOYW1lID0gZmlsZW5hbWU7Ci0gICAgW3NlbGYgc2V0TmFtZTp0aGVOYW1lXTsKKyAgICBu YW1lID0gdGhlTmFtZTsKICAgICAKICAgICBbc2VsZiBjbG9zZVJlc291cmNlRmlsZTpyZXNSZWZd OwogICAgIApAQCAtMzUyLDcgKzM1Miw3IEBAIC0gKEJPT0wpX3RyeUxvYWQKICAgICBDRkFic29s dXRlVGltZSBjdXJyZW50VGltZTsKICAgICBDRkFic29sdXRlVGltZSBkdXJhdGlvbjsKICNlbmRp ZgotICAgIExPRyhQbHVnaW5zLCAiJWYgTG9hZCB0aW1pbmcgc3RhcnRlZCBmb3I6ICVAIiwgc3Rh cnQsIFtzZWxmIG5hbWVdKTsKKyAgICBMT0coUGx1Z2lucywgIiVmIExvYWQgdGltaW5nIHN0YXJ0 ZWQgZm9yOiAlQCIsIHN0YXJ0LCAoTlNTdHJpbmcgKilbc2VsZiBuYW1lXSk7CiAKICAgICBpZiAo aXNMb2FkZWQpCiAgICAgICAgIHJldHVybiBZRVM7CkBAIC02MjUsOSArNjI1LDkgQEAgLSAoQk9P TClfdHJ5TG9hZAogICAgICAgICBwbHVnaW5WZXJzaW9uID0gcGx1Z2luRnVuY3MudmVyc2lvbjsK ICAgICAgICAgCiAgICAgICAgIGlmIChwbHVnaW5GdW5jcy5qYXZhQ2xhc3MpCi0gICAgICAgICAg ICBMT0coTGl2ZUNvbm5lY3QsICIlQDogIG1hY2gtbyBlbnRyeSBwb2ludCBmb3IgTlBQX0dldEph dmFDbGFzcyA9ICVwIiwgW3NlbGYgbmFtZV0sIHBsdWdpbkZ1bmNzLmphdmFDbGFzcyk7CisgICAg ICAgICAgICBMT0coTGl2ZUNvbm5lY3QsICIlQDogIG1hY2gtbyBlbnRyeSBwb2ludCBmb3IgTlBQ X0dldEphdmFDbGFzcyA9ICVwIiwgKE5TU3RyaW5nICopW3NlbGYgbmFtZV0sIHBsdWdpbkZ1bmNz LmphdmFDbGFzcyk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIExPRyhMaXZlQ29ubmVjdCwg IiVAOiAgbm8gZW50cnkgcG9pbnQgZm9yIE5QUF9HZXRKYXZhQ2xhc3MiLCBbc2VsZiBuYW1lXSk7 CisgICAgICAgICAgICBMT0coTGl2ZUNvbm5lY3QsICIlQDogIG5vIGVudHJ5IHBvaW50IGZvciBO UFBfR2V0SmF2YUNsYXNzIiwgKE5TU3RyaW5nICopW3NlbGYgbmFtZV0pOwogCiAjaWZkZWYgU1VQ UE9SVF9DRk0KICAgICB9CkBAIC03MzYsNyArNzM2LDcgQEAgLSAodm9pZClfdW5sb2FkV2l0aFNo dXRkb3duOihCT09MKXNodXRkbwogICAgIGlmICghaXNMb2FkZWQpCiAgICAgICAgIHJldHVybjsK ICAgICAKLSAgICBMT0coUGx1Z2lucywgIlVubG9hZGluZyAlQC4uLiIsIG5hbWUpOworICAgIExP RyhQbHVnaW5zLCAiVW5sb2FkaW5nICVALi4uIiwgKE5TU3RyaW5nICopbmFtZSk7CiAKICAgICAv LyBDYW5ub3QgdW5sb2FkIGEgcGx1Zy1pbiBwYWNrYWdlIHdoaWxlIGFuIGluc3RhbmNlIGlzIHN0 aWxsIHVzaW5nIGl0CiAgICAgaWYgKGluc3RhbmNlQ291bnQgPiAwKSB7CkluZGV4OiBXZWJLaXQv bWFjL1BsdWdpbnMvV2ViUGx1Z2luUGFja2FnZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFj L1BsdWdpbnMvV2ViUGx1Z2luUGFja2FnZS5tbQkocmV2aXNpb24gNjE1MDgpCisrKyBXZWJLaXQv bWFjL1BsdWdpbnMvV2ViUGx1Z2luUGFja2FnZS5tbQkod29ya2luZyBjb3B5KQpAQCAtOTQsNyAr OTQsNyBAQCAtIChCT09MKWxvYWQKICAgICAKICNpZiAhTE9HX0RJU0FCTEVECiAgICAgQ0ZBYnNv bHV0ZVRpbWUgZHVyYXRpb24gPSBDRkFic29sdXRlVGltZUdldEN1cnJlbnQoKSAtIHN0YXJ0Owot ICAgIExPRyhQbHVnaW5zLCAicHJpbmNpcGFsQ2xhc3MgdG9vayAlZiBzZWNvbmRzIGZvcjogJUAi LCBkdXJhdGlvbiwgW3NlbGYgbmFtZV0pOworICAgIExPRyhQbHVnaW5zLCAicHJpbmNpcGFsQ2xh c3MgdG9vayAlZiBzZWNvbmRzIGZvcjogJUAiLCBkdXJhdGlvbiwgKE5TU3RyaW5nICopW3NlbGYg bmFtZV0pOwogI2VuZGlmCiAgICAgcmV0dXJuIFtzdXBlciBsb2FkXTsKIH0KSW5kZXg6IFdlYktp dC9tYWMvUGx1Z2lucy9Ib3N0ZWQvTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvbWFjL1BsdWdpbnMvSG9zdGVkL05ldHNjYXBlUGx1Z2luSG9zdE1hbmFn ZXIubW0JKHJldmlzaW9uIDYxNTA4KQorKysgV2ViS2l0L21hYy9QbHVnaW5zL0hvc3RlZC9OZXRz Y2FwZVBsdWdpbkhvc3RNYW5hZ2VyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNTYsNyArMTU2LDcg QEAgYm9vbCBOZXRzY2FwZVBsdWdpbkhvc3RNYW5hZ2VyOjpzcGF3blBsdQogICAgIAogICAgIE5T RGljdGlvbmFyeSAqaG9zdFByb3BlcnRpZXMgPSBbW05TRGljdGlvbmFyeSBhbGxvY10gaW5pdFdp dGhPYmplY3RzQW5kS2V5czoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZp c2libGVOYW1lLCBAInZpc2libGVOYW1lIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFtwYWNrYWdlIHBhdGhdLCBAImJ1bmRsZVBhdGgiLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKE5TU3RyaW5nICopW3BhY2thZ2UgcGF0aF0sIEAiYnVuZGxlUGF0 aCIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuaWxdOwogICAgIAogICAg IGRhdGEgPSBbTlNQcm9wZXJ0eUxpc3RTZXJpYWxpemF0aW9uIGRhdGFGcm9tUHJvcGVydHlMaXN0 Omhvc3RQcm9wZXJ0aWVzIGZvcm1hdDpOU1Byb3BlcnR5TGlzdEJpbmFyeUZvcm1hdF92MV8wIGVy cm9yRGVzY3JpcHRpb246bmlsXTsKSW5kZXg6IFdlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQkocmV2aXNpb24gNjE1MDgpCisrKyBXZWJLaXQv bWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCSh3b3JraW5nIGNvcHkp CkBAIC0xNjMxLDggKzE2MzEsMTAgQEAgUGFzc1JlZlB0cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVy Q2xpZW50OgogICAgICAgICAgICAgS1VSTCBwbHVnaW5QYWdlVVJMID0gZG9jdW1lbnQtPmNvbXBs ZXRlVVJMKGRlcHJlY2F0ZWRQYXJzZVVSTChwYXJhbWV0ZXJWYWx1ZShwYXJhbU5hbWVzLCBwYXJh bVZhbHVlcywgInBsdWdpbnNwYWdlIikpKTsKICAgICAgICAgICAgIGlmICghcGx1Z2luUGFnZVVS TC5wcm90b2NvbEluSFRUUEZhbWlseSgpKQogICAgICAgICAgICAgICAgIHBsdWdpblBhZ2VVUkwg PSBLVVJMKCk7CisgICAgICAgICAgICBOU1N0cmluZyAqcGx1Z2luTmFtZSA9IHBsdWdpblBhY2th Z2UgPyAoTlNTdHJpbmcgKilbcGx1Z2luUGFja2FnZSBuYW1lXSA6IG5pbDsKKwogICAgICAgICAg ICAgTlNFcnJvciAqZXJyb3IgPSBbW05TRXJyb3IgYWxsb2NdIF9pbml0V2l0aFBsdWdpbkVycm9y Q29kZTplcnJvckNvZGUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnRlbnRVUkw6cGx1Z2luVVJMIHBsdWdpblBhZ2VVUkw6cGx1 Z2luUGFnZVVSTCBwbHVnaW5OYW1lOltwbHVnaW5QYWNrYWdlIG5hbWVdIE1JTUVUeXBlOk1JTUVU eXBlXTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnRlbnRVUkw6cGx1Z2luVVJMIHBsdWdpblBhZ2VVUkw6cGx1Z2luUGFnZVVS TCBwbHVnaW5OYW1lOnBsdWdpbk5hbWUgTUlNRVR5cGU6TUlNRVR5cGVdOwogICAgICAgICAgICAg Q2FsbFJlc291cmNlTG9hZERlbGVnYXRlKGltcGxlbWVudGF0aW9ucy0+cGx1Z0luRmFpbGVkV2l0 aEVycm9yRnVuYywgW21fd2ViRnJhbWUuZ2V0KCkgd2ViVmlld10sCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgQHNlbGVjdG9yKHdlYlZpZXc6cGx1Z0luRmFpbGVkV2l0aEVy cm9yOmRhdGFTb3VyY2U6KSwgZXJyb3IsIFttX3dlYkZyYW1lLmdldCgpIF9kYXRhU291cmNlXSk7 CiAgICAgICAgICAgICBbZXJyb3IgcmVsZWFzZV07CkBAIC0xNzIxLDcgKzE3MjMsOCBAQCBQYXNz UmVmUHRyPFdpZGdldD4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6CiAgICAgaWYgKCF2aWV3KSB7CiAg ICAgICAgIFdlYlJlc291cmNlRGVsZWdhdGVJbXBsZW1lbnRhdGlvbkNhY2hlKiBpbXBsZW1lbnRh dGlvbnMgPSBXZWJWaWV3R2V0UmVzb3VyY2VMb2FkRGVsZWdhdGVJbXBsZW1lbnRhdGlvbnMoZ2V0 V2ViVmlldyhtX3dlYkZyYW1lLmdldCgpKSk7CiAgICAgICAgIGlmIChpbXBsZW1lbnRhdGlvbnMt PnBsdWdJbkZhaWxlZFdpdGhFcnJvckZ1bmMpIHsKLSAgICAgICAgICAgIE5TRXJyb3IgKmVycm9y ID0gW1tOU0Vycm9yIGFsbG9jXSBfaW5pdFdpdGhQbHVnaW5FcnJvckNvZGU6V2ViS2l0RXJyb3JK YXZhVW5hdmFpbGFibGUgY29udGVudFVSTDpuaWwgcGx1Z2luUGFnZVVSTDpuaWwgcGx1Z2luTmFt ZTpbcGx1Z2luUGFja2FnZSBuYW1lXSBNSU1FVHlwZTpNSU1FVHlwZV07CisgICAgICAgICAgICBO U1N0cmluZyAqcGx1Z2luTmFtZSA9IHBsdWdpblBhY2thZ2UgPyAoTlNTdHJpbmcgKilbcGx1Z2lu UGFja2FnZSBuYW1lXSA6IG5pbDsKKyAgICAgICAgICAgIE5TRXJyb3IgKmVycm9yID0gW1tOU0Vy cm9yIGFsbG9jXSBfaW5pdFdpdGhQbHVnaW5FcnJvckNvZGU6V2ViS2l0RXJyb3JKYXZhVW5hdmFp bGFibGUgY29udGVudFVSTDpuaWwgcGx1Z2luUGFnZVVSTDpuaWwgcGx1Z2luTmFtZTpwbHVnaW5O YW1lIE1JTUVUeXBlOk1JTUVUeXBlXTsKICAgICAgICAgICAgIENhbGxSZXNvdXJjZUxvYWREZWxl Z2F0ZShpbXBsZW1lbnRhdGlvbnMtPnBsdWdJbkZhaWxlZFdpdGhFcnJvckZ1bmMsIFttX3dlYkZy YW1lLmdldCgpIHdlYlZpZXddLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IEBzZWxlY3Rvcih3ZWJWaWV3OnBsdWdJbkZhaWxlZFdpdGhFcnJvcjpkYXRhU291cmNlOiksIGVy cm9yLCBbbV93ZWJGcmFtZS5nZXQoKSBfZGF0YVNvdXJjZV0pOwogICAgICAgICAgICAgW2Vycm9y IHJlbGVhc2VdOwo=