95904 2012-09-05 15:37:36 -0700 Remove String::operator+=() from windows platform code 2012-09-06 05:54:22 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All Windows XP RESOLVED FIXED P2 Normal --- 1 paroga paroga webkit.review.bot oldest_to_newest 712595 0 paroga 2012-09-05 15:37:36 -0700 Remove String::operator+=() from windows platform code 712601 1 162354 paroga 2012-09-05 15:41:36 -0700 Created attachment 162354 Patch 712613 2 162354 benjamin 2012-09-05 15:54:00 -0700 Comment on attachment 162354 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162354&action=review > Source/WebCore/platform/win/ClipboardWin.cpp:150 > - String result(static_cast<UChar*>(fsPathBuffer)); > - result += String(extension); > - return result; > + return String(static_cast<UChar*>(fsPathBuffer)) + extension; I think you'd better use makeString(static_cast<UChar*>(fsPathBuffer), extension). > Source/WebKit/win/AccessibleBase.cpp:377 > - accessKeyModifiers += "Ctrl+"; > + accessKeyModifiersBuilder.append("Ctrl+"); > if (modifiers & PlatformEvent::AltKey) > - accessKeyModifiers += "Alt+"; > + accessKeyModifiersBuilder.append("Alt+"); > if (modifiers & PlatformEvent::ShiftKey) > - accessKeyModifiers += "Shift+"; > + accessKeyModifiersBuilder.append("Shift+"); > if (modifiers & PlatformEvent::MetaKey) > - accessKeyModifiers += "Win+"; > + accessKeyModifiersBuilder.append("Win+"); append() -> appendLiteral() > Source/WebKit/win/ChangeLog:15 > + (if): Confused prepare-ChangeLog is confused > Source/WebKit/win/WebView.cpp:5549 > + result.append(", "); \ appendLiteral() > Source/WebKit/win/WebView.cpp:5550 > + result.append(#name); \ appendLiteral() > Source/WebKit/win/WebView.cpp:-5561 > - if (lparam & GCS_COMPATTR) { > - result = "GCS_COMPATTR"; > - needsComma = true; > - } This is strange, but I can't figure why this code is there. Maybe needsComma was not in APPEND_ARGUMENT_NAME originally. > Source/WebKit2/UIProcess/win/WebView.cpp:1245 > + result.append(", "); \ > + result.append(#name); \ appendLiteral(). 712639 3 162362 paroga 2012-09-05 16:13:52 -0700 Created attachment 162362 Patch 712670 4 162362 buildbot 2012-09-05 16:45:29 -0700 Comment on attachment 162362 Patch Attachment 162362 did not pass win-ews (win): Output: http://queues.webkit.org/results/13769123 712940 5 162431 paroga 2012-09-06 00:01:19 -0700 Created attachment 162431 Patch 713204 6 162431 webkit.review.bot 2012-09-06 05:54:19 -0700 Comment on attachment 162431 Patch Clearing flags on attachment: 162431 Committed r127732: <http://trac.webkit.org/changeset/127732> 713205 7 webkit.review.bot 2012-09-06 05:54:22 -0700 All reviewed patches have been landed. Closing bug. 162354 2012-09-05 15:41:36 -0700 2012-09-05 16:13:52 -0700 Patch bug-95904.patch text/plain 7380 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMWJlYmUzLi5hNWJkYTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTItMDktMDUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmVtb3ZlIFN0cmluZzo6b3BlcmF0b3IrPSgpIGZyb20gd2luZG93cyBwbGF0Zm9y bSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NTkwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVz ZSBTdHJpbmdCdWlsZGVyIGFuZCBvcGVyYXRvcisoKSB0byBjb25jYXRlbmF0ZSBzdHJpbmdzIGlu c3RlYWQgb2Ygb3BlcmF0b3IrPSgpLgorCisgICAgICAgICogcGxhdGZvcm0vd2luL0NsaXBib2Fy ZFdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmaWxlc3lzdGVtUGF0aEZyb21VcmxPclRpdGxl KToKKwogMjAxMi0wOS0wNSAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4K IAogICAgICAgICBGaXggdGhlIHVzZXMgb2YgU3RyaW5nOjpvcGVyYXRvcis9KCkgZm9yIE1hYwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0NsaXBib2FyZFdpbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJkV2luLmNwcAppbmRleCBkMWMx Mzg2Li5lODUzY2QwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xp cGJvYXJkV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJk V2luLmNwcApAQCAtMTQ3LDkgKzE0Nyw3IEBAIHN0YXRpYyBTdHJpbmcgZmlsZXN5c3RlbVBhdGhG cm9tVXJsT3JUaXRsZShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsCiAgICAg ICAgIHJldHVybiBTdHJpbmcoc3RhdGljX2Nhc3Q8VUNoYXIqPihmc1BhdGhCdWZmZXIpKTsKICAg ICB9CiAKLSAgICBTdHJpbmcgcmVzdWx0KHN0YXRpY19jYXN0PFVDaGFyKj4oZnNQYXRoQnVmZmVy KSk7Ci0gICAgcmVzdWx0ICs9IFN0cmluZyhleHRlbnNpb24pOwotICAgIHJldHVybiByZXN1bHQ7 CisgICAgcmV0dXJuIFN0cmluZyhzdGF0aWNfY2FzdDxVQ2hhcio+KGZzUGF0aEJ1ZmZlcikpICsg ZXh0ZW5zaW9uOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0Fj Y2Vzc2libGVCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL0FjY2Vzc2libGVCYXNlLmNwcApp bmRleCAyY2Y4Zjk1Li4wNmRlZTA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9BY2Nl c3NpYmxlQmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vQWNjZXNzaWJsZUJhc2UuY3Bw CkBAIC0zNjIsMTggKzM2MiwyMCBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIEFjY2Vzc2li bGVCYXNlOjpnZXRfYWNjS2V5Ym9hcmRTaG9ydGN1dChWQVJJQU5UIHZDaGlsZAogCiAgICAgc3Rh dGljIFN0cmluZyBhY2Nlc3NLZXlNb2RpZmllcnM7CiAgICAgaWYgKGFjY2Vzc0tleU1vZGlmaWVy cy5pc051bGwoKSkgeworICAgICAgICBTdHJpbmdCdWlsZGVyIGFjY2Vzc0tleU1vZGlmaWVyc0J1 aWxkZXI7CiAgICAgICAgIHVuc2lnbmVkIG1vZGlmaWVycyA9IEV2ZW50SGFuZGxlcjo6YWNjZXNz S2V5TW9kaWZpZXJzKCk7CiAgICAgICAgIC8vIEZvbGxvdyB0aGUgc2FtZSBvcmRlciBhcyBNb3pp bGxhIE1TQUEgaW1wbGVtZW50YXRpb246CiAgICAgICAgIC8vIEN0cmwrQWx0K1NoaWZ0K01ldGEr a2V5LiBNU0ROIHN0YXRlcyB0aGF0IGtleWJvYXJkIHNob3J0Y3V0IHN0cmluZ3MKICAgICAgICAg Ly8gc2hvdWxkIG5vdCBiZSBsb2NhbGl6ZWQgYW5kIGRlZmluZXMgdGhlIHNlcGFyYXRvciBhcyAi KyIuCiAgICAgICAgIGlmIChtb2RpZmllcnMgJiBQbGF0Zm9ybUV2ZW50OjpDdHJsS2V5KQotICAg ICAgICAgICAgYWNjZXNzS2V5TW9kaWZpZXJzICs9ICJDdHJsKyI7CisgICAgICAgICAgICBhY2Nl c3NLZXlNb2RpZmllcnNCdWlsZGVyLmFwcGVuZCgiQ3RybCsiKTsKICAgICAgICAgaWYgKG1vZGlm aWVycyAmIFBsYXRmb3JtRXZlbnQ6OkFsdEtleSkKLSAgICAgICAgICAgIGFjY2Vzc0tleU1vZGlm aWVycyArPSAiQWx0KyI7CisgICAgICAgICAgICBhY2Nlc3NLZXlNb2RpZmllcnNCdWlsZGVyLmFw cGVuZCgiQWx0KyIpOwogICAgICAgICBpZiAobW9kaWZpZXJzICYgUGxhdGZvcm1FdmVudDo6U2hp ZnRLZXkpCi0gICAgICAgICAgICBhY2Nlc3NLZXlNb2RpZmllcnMgKz0gIlNoaWZ0KyI7CisgICAg ICAgICAgICBhY2Nlc3NLZXlNb2RpZmllcnNCdWlsZGVyLmFwcGVuZCgiU2hpZnQrIik7CiAgICAg ICAgIGlmIChtb2RpZmllcnMgJiBQbGF0Zm9ybUV2ZW50OjpNZXRhS2V5KQotICAgICAgICAgICAg YWNjZXNzS2V5TW9kaWZpZXJzICs9ICJXaW4rIjsKKyAgICAgICAgICAgIGFjY2Vzc0tleU1vZGlm aWVyc0J1aWxkZXIuYXBwZW5kKCJXaW4rIik7CisgICAgICAgIGFjY2Vzc0tleU1vZGlmaWVycyA9 IGFjY2Vzc0tleU1vZGlmaWVyc0J1aWxkZXIudG9TdHJpbmcoKTsKICAgICB9CiAgICAgKnNob3J0 Y3V0ID0gQlN0cmluZyhTdHJpbmcoYWNjZXNzS2V5TW9kaWZpZXJzICsgYWNjZXNzS2V5KSkucmVs ZWFzZSgpOwogICAgIHJldHVybiBTX09LOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4v Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IDA3ZTRhNmUuLjEx NDc1YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0wOS0wNSAgUGF0 cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZW1vdmUgU3Ry aW5nOjpvcGVyYXRvcis9KCkgZnJvbSB3aW5kb3dzIHBsYXRmb3JtIGNvZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1OTA0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIFN0cmluZ0J1aWxkZXIgYW5k IG9wZXJhdG9yKygpIHRvIGNvbmNhdGVuYXRlIHN0cmluZ3MgaW5zdGVhZCBvZiBvcGVyYXRvcis9 KCkuCisKKyAgICAgICAgKiBBY2Nlc3NpYmxlQmFzZS5jcHA6CisgICAgICAgIChBY2Nlc3NpYmxl QmFzZTo6Z2V0X2FjY0tleWJvYXJkU2hvcnRjdXQpOgorICAgICAgICAqIFdlYkRvd25sb2FkLmNw cDoKKyAgICAgICAgKFdlYkRvd25sb2FkOjpidW5kbGVQYXRoRm9yVGFyZ2V0UGF0aCk6CisgICAg ICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChpZik6CisgICAgICAgIChpbWVDb21wb3NpdGlv bkFyZ3VtZW50TmFtZXMpOgorCiAyMDEyLTA4LTMwICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxh aW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlcGxhY2UgSlNDOjpVU3RyaW5nIGJ5IFdURjo6U3Ry aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJEb3dubG9hZC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L3dpbi9XZWJEb3dubG9hZC5jcHAKaW5kZXggY2I1ZTJjMy4uYjhmYWJlMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxvYWQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvd2luL1dlYkRvd25sb2FkLmNwcApAQCAtMTQ4LDcgKzE0OCw3IEBAIEhSRVNVTFQgU1RE TUVUSE9EQ0FMTFRZUEUgV2ViRG93bmxvYWQ6OmJ1bmRsZVBhdGhGb3JUYXJnZXRQYXRoKAogICAg IGlmIChidW5kbGVbYnVuZGxlLmxlbmd0aCgpLTFdID09ICcvJykKICAgICAgICAgYnVuZGxlLnRy dW5jYXRlKDEpOwogCi0gICAgYnVuZGxlICs9IERvd25sb2FkQnVuZGxlOjpmaWxlRXh0ZW5zaW9u KCk7CisgICAgYnVuZGxlLmFwcGVuZChEb3dubG9hZEJ1bmRsZTo6ZmlsZUV4dGVuc2lvbigpKTsK ICAgICAqYnVuZGxlUGF0aCA9IFN5c0FsbG9jU3RyaW5nTGVuKGJ1bmRsZS5jaGFyYWN0ZXJzKCks IGJ1bmRsZS5sZW5ndGgoKSk7CiAgICAgaWYgKCEqYnVuZGxlUGF0aCkKICAgICAgICByZXR1cm4g RV9GQUlMOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAppbmRleCBjM2ZkZWQ2Li5jNjA0ZjI5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dp bi9XZWJWaWV3LmNwcApAQCAtNTU0NiwxOSArNTU0NiwxNyBAQCBzdGF0aWMgdm9pZCBjb21wb3Np dGlvblRvVW5kZXJsaW5lcyhjb25zdCBWZWN0b3I8RFdPUkQ+JiBjbGF1c2VzLCBjb25zdCBWZWN0 b3I8QgogI2RlZmluZSBBUFBFTkRfQVJHVU1FTlRfTkFNRShuYW1lKSBcCiAgICAgaWYgKGxwYXJh bSAmIG5hbWUpIHsgXAogICAgICAgICBpZiAobmVlZHNDb21tYSkgXAotICAgICAgICAgICAgcmVz dWx0ICs9ICIsICI7IFwKLSAgICAgICAgICAgIHJlc3VsdCArPSAjbmFtZTsgXAorICAgICAgICAg ICAgcmVzdWx0LmFwcGVuZCgiLCAiKTsgXAorICAgICAgICByZXN1bHQuYXBwZW5kKCNuYW1lKTsg XAogICAgICAgICBuZWVkc0NvbW1hID0gdHJ1ZTsgXAogICAgIH0KIAogc3RhdGljIFN0cmluZyBp bWVDb21wb3NpdGlvbkFyZ3VtZW50TmFtZXMoTFBBUkFNIGxwYXJhbSkKIHsKLSAgICBTdHJpbmcg cmVzdWx0OworICAgIFN0cmluZ0J1aWxkZXIgcmVzdWx0OwogICAgIGJvb2wgbmVlZHNDb21tYSA9 IGZhbHNlOwotICAgIGlmIChscGFyYW0gJiBHQ1NfQ09NUEFUVFIpIHsKLSAgICAgICAgcmVzdWx0 ID0gIkdDU19DT01QQVRUUiI7Ci0gICAgICAgIG5lZWRzQ29tbWEgPSB0cnVlOwotICAgIH0KKwor ICAgIEFQUEVORF9BUkdVTUVOVF9OQU1FKEdDU19DT01QQVRUUik7CiAgICAgQVBQRU5EX0FSR1VN RU5UX05BTUUoR0NTX0NPTVBDTEFVU0UpOwogICAgIEFQUEVORF9BUkdVTUVOVF9OQU1FKEdDU19D T01QUkVBRFNUUik7CiAgICAgQVBQRU5EX0FSR1VNRU5UX05BTUUoR0NTX0NPTVBSRUFEQVRUUik7 CkBAIC01NTczLDcgKzU1NzEsNyBAQCBzdGF0aWMgU3RyaW5nIGltZUNvbXBvc2l0aW9uQXJndW1l bnROYW1lcyhMUEFSQU0gbHBhcmFtKQogICAgIEFQUEVORF9BUkdVTUVOVF9OQU1FKENTX0lOU0VS VENIQVIpOwogICAgIEFQUEVORF9BUkdVTUVOVF9OQU1FKENTX05PTU9WRUNBUkVUKTsKIAotICAg IHJldHVybiByZXN1bHQ7CisgICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOwogfQogCiBzdGF0 aWMgU3RyaW5nIGltZU5vdGlmaWNhdGlvbk5hbWUoV1BBUkFNIHdwYXJhbSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRl eCA1NTg4ZTE3Li4wMjQ2NzZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDkt MDUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVt b3ZlIFN0cmluZzo6b3BlcmF0b3IrPSgpIGZyb20gd2luZG93cyBwbGF0Zm9ybSBjb2RlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTkwNAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBTdHJpbmdCdWls ZGVyIGFuZCBvcGVyYXRvcisoKSB0byBjb25jYXRlbmF0ZSBzdHJpbmdzIGluc3RlYWQgb2Ygb3Bl cmF0b3IrPSgpLgorCisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6aWYpOgorICAgICAgICAoV2ViS2l0OjppbWVDb21wb3NpdGlvbkFyZ3VtZW50 TmFtZXMpOgorCiAyMDEyLTA5LTA1ICBCYWxhenMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9y Zz4KIAogICAgICAgICBbUXRdIFFSYXdXZWJWaWV3UHJpdmF0ZSBkb2VzIG5vdCBpbml0aWFsaXpl IHNvbWUgbWVtYmVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9X ZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAKaW5k ZXggMjhkMjZmMS4uMjhlYmFjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3dpbi9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZp ZXcuY3BwCkBAIC01NSw2ICs1NSw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9XZWJDb3JlSW5zdGFu Y2VIYW5kbGUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1dpbmRvd01lc3NhZ2VCcm9hZGNhc3Rlci5o PgogI2luY2x1ZGUgPFdlYkNvcmUvV2luZG93c1RvdWNoLmg+CisjaW5jbHVkZSA8d3RmL3RleHQv U3RyaW5nQnVpbGRlci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiAjaWYg VVNFKENHKQpAQCAtMTI0MCwxNCArMTI0MSwxNCBAQCBzdGF0aWMgdm9pZCBjb21wb3NpdGlvblRv VW5kZXJsaW5lcyhjb25zdCBWZWN0b3I8RFdPUkQ+JiBjbGF1c2VzLCBjb25zdCBWZWN0b3I8Qgog I2RlZmluZSBBUFBFTkRfQVJHVU1FTlRfTkFNRShuYW1lKSBcCiAgICAgaWYgKGxwYXJhbSAmIG5h bWUpIHsgXAogICAgICAgICBpZiAobmVlZHNDb21tYSkgXAotICAgICAgICAgICAgcmVzdWx0ICs9 ICIsICI7IFwKLSAgICAgICAgICAgIHJlc3VsdCArPSAjbmFtZTsgXAorICAgICAgICAgICAgcmVz dWx0LmFwcGVuZCgiLCAiKTsgXAorICAgICAgICByZXN1bHQuYXBwZW5kKCNuYW1lKTsgXAogICAg ICAgICBuZWVkc0NvbW1hID0gdHJ1ZTsgXAogICAgIH0KIAogc3RhdGljIFN0cmluZyBpbWVDb21w b3NpdGlvbkFyZ3VtZW50TmFtZXMoTFBBUkFNIGxwYXJhbSkKIHsKLSAgICBTdHJpbmcgcmVzdWx0 OworICAgIFN0cmluZ0J1aWxkZXIgcmVzdWx0OwogICAgIGJvb2wgbmVlZHNDb21tYSA9IGZhbHNl OwogCiAgICAgQVBQRU5EX0FSR1VNRU5UX05BTUUoR0NTX0NPTVBBVFRSKTsKQEAgLTEyNjUsNyAr MTI2Niw3IEBAIHN0YXRpYyBTdHJpbmcgaW1lQ29tcG9zaXRpb25Bcmd1bWVudE5hbWVzKExQQVJB TSBscGFyYW0pCiAgICAgQVBQRU5EX0FSR1VNRU5UX05BTUUoQ1NfSU5TRVJUQ0hBUik7CiAgICAg QVBQRU5EX0FSR1VNRU5UX05BTUUoQ1NfTk9NT1ZFQ0FSRVQpOwogCi0gICAgcmV0dXJuIHJlc3Vs dDsKKyAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5nKCk7CiB9CiAKIHN0YXRpYyBTdHJpbmcgaW1l UmVxdWVzdE5hbWUoV1BBUkFNIHdwYXJhbSkK 162362 2012-09-05 16:13:52 -0700 2012-09-06 00:01:19 -0700 Patch bug-95904.patch text/plain 7407 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMWJlYmUzLi5hNWJkYTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTItMDktMDUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmVtb3ZlIFN0cmluZzo6b3BlcmF0b3IrPSgpIGZyb20gd2luZG93cyBwbGF0Zm9y bSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NTkwNAorCisgICAgICAgIFJldmlld2VkIGJ5IEJlbmphbWluIFBvdWxhaW4uCisKKyAgICAgICAg VXNlIFN0cmluZ0J1aWxkZXIgYW5kIG9wZXJhdG9yKygpIHRvIGNvbmNhdGVuYXRlIHN0cmluZ3Mg aW5zdGVhZCBvZiBvcGVyYXRvcis9KCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vQ2xpcGJv YXJkV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbGVzeXN0ZW1QYXRoRnJvbVVybE9yVGl0 bGUpOgorCiAyMDEyLTA5LTA1ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29t PgogCiAgICAgICAgIEZpeCB0aGUgdXNlcyBvZiBTdHJpbmc6Om9wZXJhdG9yKz0oKSBmb3IgTWFj CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJkV2luLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9hcmRXaW4uY3BwCmluZGV4IGQx YzEzODYuLmU4NTNjZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9D bGlwYm9hcmRXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9h cmRXaW4uY3BwCkBAIC0xNDcsOSArMTQ3LDcgQEAgc3RhdGljIFN0cmluZyBmaWxlc3lzdGVtUGF0 aEZyb21VcmxPclRpdGxlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGwKICAg ICAgICAgcmV0dXJuIFN0cmluZyhzdGF0aWNfY2FzdDxVQ2hhcio+KGZzUGF0aEJ1ZmZlcikpOwog ICAgIH0KIAotICAgIFN0cmluZyByZXN1bHQoc3RhdGljX2Nhc3Q8VUNoYXIqPihmc1BhdGhCdWZm ZXIpKTsKLSAgICByZXN1bHQgKz0gU3RyaW5nKGV4dGVuc2lvbik7Ci0gICAgcmV0dXJuIHJlc3Vs dDsKKyAgICByZXR1cm4gbWFrZVN0cmluZyhzdGF0aWNfY2FzdDxVQ2hhcio+KGZzUGF0aEJ1ZmZl ciksIGV4dGVuc2lvbik7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93 aW4vQWNjZXNzaWJsZUJhc2UuY3BwIGIvU291cmNlL1dlYktpdC93aW4vQWNjZXNzaWJsZUJhc2Uu Y3BwCmluZGV4IDJjZjhmOTUuLjA2ZGVlMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2lu L0FjY2Vzc2libGVCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9BY2Nlc3NpYmxlQmFz ZS5jcHAKQEAgLTM2MiwxOCArMzYyLDIwIEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgQWNj ZXNzaWJsZUJhc2U6OmdldF9hY2NLZXlib2FyZFNob3J0Y3V0KFZBUklBTlQgdkNoaWxkCiAKICAg ICBzdGF0aWMgU3RyaW5nIGFjY2Vzc0tleU1vZGlmaWVyczsKICAgICBpZiAoYWNjZXNzS2V5TW9k aWZpZXJzLmlzTnVsbCgpKSB7CisgICAgICAgIFN0cmluZ0J1aWxkZXIgYWNjZXNzS2V5TW9kaWZp ZXJzQnVpbGRlcjsKICAgICAgICAgdW5zaWduZWQgbW9kaWZpZXJzID0gRXZlbnRIYW5kbGVyOjph Y2Nlc3NLZXlNb2RpZmllcnMoKTsKICAgICAgICAgLy8gRm9sbG93IHRoZSBzYW1lIG9yZGVyIGFz IE1vemlsbGEgTVNBQSBpbXBsZW1lbnRhdGlvbjoKICAgICAgICAgLy8gQ3RybCtBbHQrU2hpZnQr TWV0YStrZXkuIE1TRE4gc3RhdGVzIHRoYXQga2V5Ym9hcmQgc2hvcnRjdXQgc3RyaW5ncwogICAg ICAgICAvLyBzaG91bGQgbm90IGJlIGxvY2FsaXplZCBhbmQgZGVmaW5lcyB0aGUgc2VwYXJhdG9y IGFzICIrIi4KICAgICAgICAgaWYgKG1vZGlmaWVycyAmIFBsYXRmb3JtRXZlbnQ6OkN0cmxLZXkp Ci0gICAgICAgICAgICBhY2Nlc3NLZXlNb2RpZmllcnMgKz0gIkN0cmwrIjsKKyAgICAgICAgICAg IGFjY2Vzc0tleU1vZGlmaWVyc0J1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiQ3RybCsiKTsKICAgICAg ICAgaWYgKG1vZGlmaWVycyAmIFBsYXRmb3JtRXZlbnQ6OkFsdEtleSkKLSAgICAgICAgICAgIGFj Y2Vzc0tleU1vZGlmaWVycyArPSAiQWx0KyI7CisgICAgICAgICAgICBhY2Nlc3NLZXlNb2RpZmll cnNCdWlsZGVyLmFwcGVuZExpdGVyYWwoIkFsdCsiKTsKICAgICAgICAgaWYgKG1vZGlmaWVycyAm IFBsYXRmb3JtRXZlbnQ6OlNoaWZ0S2V5KQotICAgICAgICAgICAgYWNjZXNzS2V5TW9kaWZpZXJz ICs9ICJTaGlmdCsiOworICAgICAgICAgICAgYWNjZXNzS2V5TW9kaWZpZXJzQnVpbGRlci5hcHBl bmRMaXRlcmFsKCJTaGlmdCsiKTsKICAgICAgICAgaWYgKG1vZGlmaWVycyAmIFBsYXRmb3JtRXZl bnQ6Ok1ldGFLZXkpCi0gICAgICAgICAgICBhY2Nlc3NLZXlNb2RpZmllcnMgKz0gIldpbisiOwor ICAgICAgICAgICAgYWNjZXNzS2V5TW9kaWZpZXJzQnVpbGRlci5hcHBlbmRMaXRlcmFsKCJXaW4r Iik7CisgICAgICAgIGFjY2Vzc0tleU1vZGlmaWVycyA9IGFjY2Vzc0tleU1vZGlmaWVyc0J1aWxk ZXIudG9TdHJpbmcoKTsKICAgICB9CiAgICAgKnNob3J0Y3V0ID0gQlN0cmluZyhTdHJpbmcoYWNj ZXNzS2V5TW9kaWZpZXJzICsgYWNjZXNzS2V5KSkucmVsZWFzZSgpOwogICAgIHJldHVybiBTX09L OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC93aW4vQ2hhbmdlTG9nCmluZGV4IDA3ZTRhNmUuLjExNDc1YzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOSBAQAorMjAxMi0wOS0wNSAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FA d2Via2l0Lm9yZz4KKworICAgICAgICBSZW1vdmUgU3RyaW5nOjpvcGVyYXRvcis9KCkgZnJvbSB3 aW5kb3dzIHBsYXRmb3JtIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk1OTA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQmVuamFtaW4gUG91bGFp bi4KKworICAgICAgICBVc2UgU3RyaW5nQnVpbGRlciBhbmQgb3BlcmF0b3IrKCkgdG8gY29uY2F0 ZW5hdGUgc3RyaW5ncyBpbnN0ZWFkIG9mIG9wZXJhdG9yKz0oKS4KKworICAgICAgICAqIEFjY2Vz c2libGVCYXNlLmNwcDoKKyAgICAgICAgKEFjY2Vzc2libGVCYXNlOjpnZXRfYWNjS2V5Ym9hcmRT aG9ydGN1dCk6CisgICAgICAgICogV2ViRG93bmxvYWQuY3BwOgorICAgICAgICAoV2ViRG93bmxv YWQ6OmJ1bmRsZVBhdGhGb3JUYXJnZXRQYXRoKToKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAg ICAgICAgKGltZUNvbXBvc2l0aW9uQXJndW1lbnROYW1lcyk6CisKIDIwMTItMDgtMzAgIEJlbmph bWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVwbGFjZSBKU0M6 OlVTdHJpbmcgYnkgV1RGOjpTdHJpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dl YkRvd25sb2FkLmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkRvd25sb2FkLmNwcAppbmRleCBj YjVlMmMzLi5iOGZhYmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJEb3dubG9h ZC5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxvYWQuY3BwCkBAIC0xNDgsNyAr MTQ4LDcgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJEb3dubG9hZDo6YnVuZGxlUGF0 aEZvclRhcmdldFBhdGgoCiAgICAgaWYgKGJ1bmRsZVtidW5kbGUubGVuZ3RoKCktMV0gPT0gJy8n KQogICAgICAgICBidW5kbGUudHJ1bmNhdGUoMSk7CiAKLSAgICBidW5kbGUgKz0gRG93bmxvYWRC dW5kbGU6OmZpbGVFeHRlbnNpb24oKTsKKyAgICBidW5kbGUuYXBwZW5kKERvd25sb2FkQnVuZGxl OjpmaWxlRXh0ZW5zaW9uKCkpOwogICAgICpidW5kbGVQYXRoID0gU3lzQWxsb2NTdHJpbmdMZW4o YnVuZGxlLmNoYXJhY3RlcnMoKSwgYnVuZGxlLmxlbmd0aCgpKTsKICAgICBpZiAoISpidW5kbGVQ YXRoKQogICAgICAgIHJldHVybiBFX0ZBSUw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCmluZGV4IGMzZmRl ZDYuLmM2MDRmMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCkBAIC01NTQ2LDE5ICs1NTQ2LDE3IEBA IHN0YXRpYyB2b2lkIGNvbXBvc2l0aW9uVG9VbmRlcmxpbmVzKGNvbnN0IFZlY3RvcjxEV09SRD4m IGNsYXVzZXMsIGNvbnN0IFZlY3RvcjxCCiAjZGVmaW5lIEFQUEVORF9BUkdVTUVOVF9OQU1FKG5h bWUpIFwKICAgICBpZiAobHBhcmFtICYgbmFtZSkgeyBcCiAgICAgICAgIGlmIChuZWVkc0NvbW1h KSBcCi0gICAgICAgICAgICByZXN1bHQgKz0gIiwgIjsgXAotICAgICAgICAgICAgcmVzdWx0ICs9 ICNuYW1lOyBcCisgICAgICAgICAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgiLCAiKTsgXAorICAg ICAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgjbmFtZSk7IFwKICAgICAgICAgbmVlZHNDb21tYSA9 IHRydWU7IFwKICAgICB9CiAKIHN0YXRpYyBTdHJpbmcgaW1lQ29tcG9zaXRpb25Bcmd1bWVudE5h bWVzKExQQVJBTSBscGFyYW0pCiB7Ci0gICAgU3RyaW5nIHJlc3VsdDsKKyAgICBTdHJpbmdCdWls ZGVyIHJlc3VsdDsKICAgICBib29sIG5lZWRzQ29tbWEgPSBmYWxzZTsKLSAgICBpZiAobHBhcmFt ICYgR0NTX0NPTVBBVFRSKSB7Ci0gICAgICAgIHJlc3VsdCA9ICJHQ1NfQ09NUEFUVFIiOwotICAg ICAgICBuZWVkc0NvbW1hID0gdHJ1ZTsKLSAgICB9CisKKyAgICBBUFBFTkRfQVJHVU1FTlRfTkFN RShHQ1NfQ09NUEFUVFIpOwogICAgIEFQUEVORF9BUkdVTUVOVF9OQU1FKEdDU19DT01QQ0xBVVNF KTsKICAgICBBUFBFTkRfQVJHVU1FTlRfTkFNRShHQ1NfQ09NUFJFQURTVFIpOwogICAgIEFQUEVO RF9BUkdVTUVOVF9OQU1FKEdDU19DT01QUkVBREFUVFIpOwpAQCAtNTU3Myw3ICs1NTcxLDcgQEAg c3RhdGljIFN0cmluZyBpbWVDb21wb3NpdGlvbkFyZ3VtZW50TmFtZXMoTFBBUkFNIGxwYXJhbSkK ICAgICBBUFBFTkRfQVJHVU1FTlRfTkFNRShDU19JTlNFUlRDSEFSKTsKICAgICBBUFBFTkRfQVJH VU1FTlRfTkFNRShDU19OT01PVkVDQVJFVCk7CiAKLSAgICByZXR1cm4gcmVzdWx0OworICAgIHJl dHVybiByZXN1bHQudG9TdHJpbmcoKTsKIH0KIAogc3RhdGljIFN0cmluZyBpbWVOb3RpZmljYXRp b25OYW1lKFdQQVJBTSB3cGFyYW0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTU4OGUxNy4uMDI0Njc2YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA5LTA1ICBQYXRyaWNrIEdhbnN0ZXJlciAg PHBhcm9nYUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSBTdHJpbmc6Om9wZXJhdG9yKz0o KSBmcm9tIHdpbmRvd3MgcGxhdGZvcm0gY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU5MDQKKworICAgICAgICBSZXZpZXdlZCBieSBCZW5qYW1p biBQb3VsYWluLgorCisgICAgICAgIFVzZSBTdHJpbmdCdWlsZGVyIGFuZCBvcGVyYXRvcisoKSB0 byBjb25jYXRlbmF0ZSBzdHJpbmdzIGluc3RlYWQgb2Ygb3BlcmF0b3IrPSgpLgorCisgICAgICAg ICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6aW1lQ29tcG9z aXRpb25Bcmd1bWVudE5hbWVzKToKKwogMjAxMi0wOS0wNSAgQmFsYXpzIEtlbGVtZW4gIDxrYmFs YXpzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBRUmF3V2ViVmlld1ByaXZhdGUgZG9lcyBu b3QgaW5pdGlhbGl6ZSBzb21lIG1lbWJlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy93aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dl YlZpZXcuY3BwCmluZGV4IDI4ZDI2ZjEuLjI4ZWJhYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3dpbi9XZWJWaWV3LmNwcApAQCAtNTUsNiArNTUsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUv V2ViQ29yZUluc3RhbmNlSGFuZGxlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9XaW5kb3dNZXNzYWdl QnJvYWRjYXN0ZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1dpbmRvd3NUb3VjaC5oPgorI2luY2x1 ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJp bmcuaD4KIAogI2lmIFVTRShDRykKQEAgLTEyNDAsMTQgKzEyNDEsMTQgQEAgc3RhdGljIHZvaWQg Y29tcG9zaXRpb25Ub1VuZGVybGluZXMoY29uc3QgVmVjdG9yPERXT1JEPiYgY2xhdXNlcywgY29u c3QgVmVjdG9yPEIKICNkZWZpbmUgQVBQRU5EX0FSR1VNRU5UX05BTUUobmFtZSkgXAogICAgIGlm IChscGFyYW0gJiBuYW1lKSB7IFwKICAgICAgICAgaWYgKG5lZWRzQ29tbWEpIFwKLSAgICAgICAg ICAgIHJlc3VsdCArPSAiLCAiOyBcCi0gICAgICAgICAgICByZXN1bHQgKz0gI25hbWU7IFwKKyAg ICAgICAgICAgIHJlc3VsdC5hcHBlbmRMaXRlcmFsKCIsICIpOyBcCisgICAgICAgIHJlc3VsdC5h cHBlbmRMaXRlcmFsKCNuYW1lKTsgXAogICAgICAgICBuZWVkc0NvbW1hID0gdHJ1ZTsgXAogICAg IH0KIAogc3RhdGljIFN0cmluZyBpbWVDb21wb3NpdGlvbkFyZ3VtZW50TmFtZXMoTFBBUkFNIGxw YXJhbSkKIHsKLSAgICBTdHJpbmcgcmVzdWx0OworICAgIFN0cmluZ0J1aWxkZXIgcmVzdWx0Owog ICAgIGJvb2wgbmVlZHNDb21tYSA9IGZhbHNlOwogCiAgICAgQVBQRU5EX0FSR1VNRU5UX05BTUUo R0NTX0NPTVBBVFRSKTsKQEAgLTEyNjUsNyArMTI2Niw3IEBAIHN0YXRpYyBTdHJpbmcgaW1lQ29t cG9zaXRpb25Bcmd1bWVudE5hbWVzKExQQVJBTSBscGFyYW0pCiAgICAgQVBQRU5EX0FSR1VNRU5U X05BTUUoQ1NfSU5TRVJUQ0hBUik7CiAgICAgQVBQRU5EX0FSR1VNRU5UX05BTUUoQ1NfTk9NT1ZF Q0FSRVQpOwogCi0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5n KCk7CiB9CiAKIHN0YXRpYyBTdHJpbmcgaW1lUmVxdWVzdE5hbWUoV1BBUkFNIHdwYXJhbSkK 162431 2012-09-06 00:01:19 -0700 2012-09-06 05:54:19 -0700 Patch bug-95904.patch text/plain 7413 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMWJlYmUzLi5hNWJkYTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTItMDktMDUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmVtb3ZlIFN0cmluZzo6b3BlcmF0b3IrPSgpIGZyb20gd2luZG93cyBwbGF0Zm9y bSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NTkwNAorCisgICAgICAgIFJldmlld2VkIGJ5IEJlbmphbWluIFBvdWxhaW4uCisKKyAgICAgICAg VXNlIFN0cmluZ0J1aWxkZXIgYW5kIG9wZXJhdG9yKygpIHRvIGNvbmNhdGVuYXRlIHN0cmluZ3Mg aW5zdGVhZCBvZiBvcGVyYXRvcis9KCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vQ2xpcGJv YXJkV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbGVzeXN0ZW1QYXRoRnJvbVVybE9yVGl0 bGUpOgorCiAyMDEyLTA5LTA1ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29t PgogCiAgICAgICAgIEZpeCB0aGUgdXNlcyBvZiBTdHJpbmc6Om9wZXJhdG9yKz0oKSBmb3IgTWFj CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJvYXJkV2luLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9hcmRXaW4uY3BwCmluZGV4IGQx YzEzODYuLmU4NTNjZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9D bGlwYm9hcmRXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9h cmRXaW4uY3BwCkBAIC0xNDcsOSArMTQ3LDcgQEAgc3RhdGljIFN0cmluZyBmaWxlc3lzdGVtUGF0 aEZyb21VcmxPclRpdGxlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGwKICAg ICAgICAgcmV0dXJuIFN0cmluZyhzdGF0aWNfY2FzdDxVQ2hhcio+KGZzUGF0aEJ1ZmZlcikpOwog ICAgIH0KIAotICAgIFN0cmluZyByZXN1bHQoc3RhdGljX2Nhc3Q8VUNoYXIqPihmc1BhdGhCdWZm ZXIpKTsKLSAgICByZXN1bHQgKz0gU3RyaW5nKGV4dGVuc2lvbik7Ci0gICAgcmV0dXJuIHJlc3Vs dDsKKyAgICByZXR1cm4gbWFrZVN0cmluZyhzdGF0aWNfY2FzdDxjb25zdCBVQ2hhcio+KGZzUGF0 aEJ1ZmZlciksIGV4dGVuc2lvbik7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC93aW4vQWNjZXNzaWJsZUJhc2UuY3BwIGIvU291cmNlL1dlYktpdC93aW4vQWNjZXNzaWJs ZUJhc2UuY3BwCmluZGV4IDJjZjhmOTUuLjA2ZGVlMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvd2luL0FjY2Vzc2libGVCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9BY2Nlc3Np YmxlQmFzZS5jcHAKQEAgLTM2MiwxOCArMzYyLDIwIEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZ UEUgQWNjZXNzaWJsZUJhc2U6OmdldF9hY2NLZXlib2FyZFNob3J0Y3V0KFZBUklBTlQgdkNoaWxk CiAKICAgICBzdGF0aWMgU3RyaW5nIGFjY2Vzc0tleU1vZGlmaWVyczsKICAgICBpZiAoYWNjZXNz S2V5TW9kaWZpZXJzLmlzTnVsbCgpKSB7CisgICAgICAgIFN0cmluZ0J1aWxkZXIgYWNjZXNzS2V5 TW9kaWZpZXJzQnVpbGRlcjsKICAgICAgICAgdW5zaWduZWQgbW9kaWZpZXJzID0gRXZlbnRIYW5k bGVyOjphY2Nlc3NLZXlNb2RpZmllcnMoKTsKICAgICAgICAgLy8gRm9sbG93IHRoZSBzYW1lIG9y ZGVyIGFzIE1vemlsbGEgTVNBQSBpbXBsZW1lbnRhdGlvbjoKICAgICAgICAgLy8gQ3RybCtBbHQr U2hpZnQrTWV0YStrZXkuIE1TRE4gc3RhdGVzIHRoYXQga2V5Ym9hcmQgc2hvcnRjdXQgc3RyaW5n cwogICAgICAgICAvLyBzaG91bGQgbm90IGJlIGxvY2FsaXplZCBhbmQgZGVmaW5lcyB0aGUgc2Vw YXJhdG9yIGFzICIrIi4KICAgICAgICAgaWYgKG1vZGlmaWVycyAmIFBsYXRmb3JtRXZlbnQ6OkN0 cmxLZXkpCi0gICAgICAgICAgICBhY2Nlc3NLZXlNb2RpZmllcnMgKz0gIkN0cmwrIjsKKyAgICAg ICAgICAgIGFjY2Vzc0tleU1vZGlmaWVyc0J1aWxkZXIuYXBwZW5kTGl0ZXJhbCgiQ3RybCsiKTsK ICAgICAgICAgaWYgKG1vZGlmaWVycyAmIFBsYXRmb3JtRXZlbnQ6OkFsdEtleSkKLSAgICAgICAg ICAgIGFjY2Vzc0tleU1vZGlmaWVycyArPSAiQWx0KyI7CisgICAgICAgICAgICBhY2Nlc3NLZXlN b2RpZmllcnNCdWlsZGVyLmFwcGVuZExpdGVyYWwoIkFsdCsiKTsKICAgICAgICAgaWYgKG1vZGlm aWVycyAmIFBsYXRmb3JtRXZlbnQ6OlNoaWZ0S2V5KQotICAgICAgICAgICAgYWNjZXNzS2V5TW9k aWZpZXJzICs9ICJTaGlmdCsiOworICAgICAgICAgICAgYWNjZXNzS2V5TW9kaWZpZXJzQnVpbGRl ci5hcHBlbmRMaXRlcmFsKCJTaGlmdCsiKTsKICAgICAgICAgaWYgKG1vZGlmaWVycyAmIFBsYXRm b3JtRXZlbnQ6Ok1ldGFLZXkpCi0gICAgICAgICAgICBhY2Nlc3NLZXlNb2RpZmllcnMgKz0gIldp bisiOworICAgICAgICAgICAgYWNjZXNzS2V5TW9kaWZpZXJzQnVpbGRlci5hcHBlbmRMaXRlcmFs KCJXaW4rIik7CisgICAgICAgIGFjY2Vzc0tleU1vZGlmaWVycyA9IGFjY2Vzc0tleU1vZGlmaWVy c0J1aWxkZXIudG9TdHJpbmcoKTsKICAgICB9CiAgICAgKnNob3J0Y3V0ID0gQlN0cmluZyhTdHJp bmcoYWNjZXNzS2V5TW9kaWZpZXJzICsgYWNjZXNzS2V5KSkucmVsZWFzZSgpOwogICAgIHJldHVy biBTX09LOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IDA3ZTRhNmUuLjExNDc1YzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0wOS0wNSAgUGF0cmljayBHYW5zdGVyZXIgIDxw YXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZW1vdmUgU3RyaW5nOjpvcGVyYXRvcis9KCkg ZnJvbSB3aW5kb3dzIHBsYXRmb3JtIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTk1OTA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQmVuamFtaW4g UG91bGFpbi4KKworICAgICAgICBVc2UgU3RyaW5nQnVpbGRlciBhbmQgb3BlcmF0b3IrKCkgdG8g Y29uY2F0ZW5hdGUgc3RyaW5ncyBpbnN0ZWFkIG9mIG9wZXJhdG9yKz0oKS4KKworICAgICAgICAq IEFjY2Vzc2libGVCYXNlLmNwcDoKKyAgICAgICAgKEFjY2Vzc2libGVCYXNlOjpnZXRfYWNjS2V5 Ym9hcmRTaG9ydGN1dCk6CisgICAgICAgICogV2ViRG93bmxvYWQuY3BwOgorICAgICAgICAoV2Vi RG93bmxvYWQ6OmJ1bmRsZVBhdGhGb3JUYXJnZXRQYXRoKToKKyAgICAgICAgKiBXZWJWaWV3LmNw cDoKKyAgICAgICAgKGltZUNvbXBvc2l0aW9uQXJndW1lbnROYW1lcyk6CisKIDIwMTItMDgtMzAg IEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVwbGFj ZSBKU0M6OlVTdHJpbmcgYnkgV1RGOjpTdHJpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv d2luL1dlYkRvd25sb2FkLmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkRvd25sb2FkLmNwcApp bmRleCBjYjVlMmMzLi5iOGZhYmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJE b3dubG9hZC5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxvYWQuY3BwCkBAIC0x NDgsNyArMTQ4LDcgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJEb3dubG9hZDo6YnVu ZGxlUGF0aEZvclRhcmdldFBhdGgoCiAgICAgaWYgKGJ1bmRsZVtidW5kbGUubGVuZ3RoKCktMV0g PT0gJy8nKQogICAgICAgICBidW5kbGUudHJ1bmNhdGUoMSk7CiAKLSAgICBidW5kbGUgKz0gRG93 bmxvYWRCdW5kbGU6OmZpbGVFeHRlbnNpb24oKTsKKyAgICBidW5kbGUuYXBwZW5kKERvd25sb2Fk QnVuZGxlOjpmaWxlRXh0ZW5zaW9uKCkpOwogICAgICpidW5kbGVQYXRoID0gU3lzQWxsb2NTdHJp bmdMZW4oYnVuZGxlLmNoYXJhY3RlcnMoKSwgYnVuZGxlLmxlbmd0aCgpKTsKICAgICBpZiAoISpi dW5kbGVQYXRoKQogICAgICAgIHJldHVybiBFX0ZBSUw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCmluZGV4 IGMzZmRlZDYuLmM2MDRmMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCkBAIC01NTQ2LDE5ICs1NTQ2 LDE3IEBAIHN0YXRpYyB2b2lkIGNvbXBvc2l0aW9uVG9VbmRlcmxpbmVzKGNvbnN0IFZlY3RvcjxE V09SRD4mIGNsYXVzZXMsIGNvbnN0IFZlY3RvcjxCCiAjZGVmaW5lIEFQUEVORF9BUkdVTUVOVF9O QU1FKG5hbWUpIFwKICAgICBpZiAobHBhcmFtICYgbmFtZSkgeyBcCiAgICAgICAgIGlmIChuZWVk c0NvbW1hKSBcCi0gICAgICAgICAgICByZXN1bHQgKz0gIiwgIjsgXAotICAgICAgICAgICAgcmVz dWx0ICs9ICNuYW1lOyBcCisgICAgICAgICAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgiLCAiKTsg XAorICAgICAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgjbmFtZSk7IFwKICAgICAgICAgbmVlZHND b21tYSA9IHRydWU7IFwKICAgICB9CiAKIHN0YXRpYyBTdHJpbmcgaW1lQ29tcG9zaXRpb25Bcmd1 bWVudE5hbWVzKExQQVJBTSBscGFyYW0pCiB7Ci0gICAgU3RyaW5nIHJlc3VsdDsKKyAgICBTdHJp bmdCdWlsZGVyIHJlc3VsdDsKICAgICBib29sIG5lZWRzQ29tbWEgPSBmYWxzZTsKLSAgICBpZiAo bHBhcmFtICYgR0NTX0NPTVBBVFRSKSB7Ci0gICAgICAgIHJlc3VsdCA9ICJHQ1NfQ09NUEFUVFIi OwotICAgICAgICBuZWVkc0NvbW1hID0gdHJ1ZTsKLSAgICB9CisKKyAgICBBUFBFTkRfQVJHVU1F TlRfTkFNRShHQ1NfQ09NUEFUVFIpOwogICAgIEFQUEVORF9BUkdVTUVOVF9OQU1FKEdDU19DT01Q Q0xBVVNFKTsKICAgICBBUFBFTkRfQVJHVU1FTlRfTkFNRShHQ1NfQ09NUFJFQURTVFIpOwogICAg IEFQUEVORF9BUkdVTUVOVF9OQU1FKEdDU19DT01QUkVBREFUVFIpOwpAQCAtNTU3Myw3ICs1NTcx LDcgQEAgc3RhdGljIFN0cmluZyBpbWVDb21wb3NpdGlvbkFyZ3VtZW50TmFtZXMoTFBBUkFNIGxw YXJhbSkKICAgICBBUFBFTkRfQVJHVU1FTlRfTkFNRShDU19JTlNFUlRDSEFSKTsKICAgICBBUFBF TkRfQVJHVU1FTlRfTkFNRShDU19OT01PVkVDQVJFVCk7CiAKLSAgICByZXR1cm4gcmVzdWx0Owor ICAgIHJldHVybiByZXN1bHQudG9TdHJpbmcoKTsKIH0KIAogc3RhdGljIFN0cmluZyBpbWVOb3Rp ZmljYXRpb25OYW1lKFdQQVJBTSB3cGFyYW0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTU4OGUxNy4uMDI0Njc2 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA5LTA1ICBQYXRyaWNrIEdhbnN0 ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSBTdHJpbmc6Om9wZXJh dG9yKz0oKSBmcm9tIHdpbmRvd3MgcGxhdGZvcm0gY29kZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU5MDQKKworICAgICAgICBSZXZpZXdlZCBieSBC ZW5qYW1pbiBQb3VsYWluLgorCisgICAgICAgIFVzZSBTdHJpbmdCdWlsZGVyIGFuZCBvcGVyYXRv cisoKSB0byBjb25jYXRlbmF0ZSBzdHJpbmdzIGluc3RlYWQgb2Ygb3BlcmF0b3IrPSgpLgorCisg ICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6aW1l Q29tcG9zaXRpb25Bcmd1bWVudE5hbWVzKToKKwogMjAxMi0wOS0wNSAgQmFsYXpzIEtlbGVtZW4g IDxrYmFsYXpzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBRUmF3V2ViVmlld1ByaXZhdGUg ZG9lcyBub3QgaW5pdGlhbGl6ZSBzb21lIG1lbWJlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv d2luL1dlYlZpZXcuY3BwCmluZGV4IDI4ZDI2ZjEuLjI4ZWJhYzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcApAQCAtNTUsNiArNTUsNyBAQAogI2luY2x1ZGUgPFdl YkNvcmUvV2ViQ29yZUluc3RhbmNlSGFuZGxlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9XaW5kb3dN ZXNzYWdlQnJvYWRjYXN0ZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1dpbmRvd3NUb3VjaC5oPgor I2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9X VEZTdHJpbmcuaD4KIAogI2lmIFVTRShDRykKQEAgLTEyNDAsMTQgKzEyNDEsMTQgQEAgc3RhdGlj IHZvaWQgY29tcG9zaXRpb25Ub1VuZGVybGluZXMoY29uc3QgVmVjdG9yPERXT1JEPiYgY2xhdXNl cywgY29uc3QgVmVjdG9yPEIKICNkZWZpbmUgQVBQRU5EX0FSR1VNRU5UX05BTUUobmFtZSkgXAog ICAgIGlmIChscGFyYW0gJiBuYW1lKSB7IFwKICAgICAgICAgaWYgKG5lZWRzQ29tbWEpIFwKLSAg ICAgICAgICAgIHJlc3VsdCArPSAiLCAiOyBcCi0gICAgICAgICAgICByZXN1bHQgKz0gI25hbWU7 IFwKKyAgICAgICAgICAgIHJlc3VsdC5hcHBlbmRMaXRlcmFsKCIsICIpOyBcCisgICAgICAgIHJl c3VsdC5hcHBlbmRMaXRlcmFsKCNuYW1lKTsgXAogICAgICAgICBuZWVkc0NvbW1hID0gdHJ1ZTsg XAogICAgIH0KIAogc3RhdGljIFN0cmluZyBpbWVDb21wb3NpdGlvbkFyZ3VtZW50TmFtZXMoTFBB UkFNIGxwYXJhbSkKIHsKLSAgICBTdHJpbmcgcmVzdWx0OworICAgIFN0cmluZ0J1aWxkZXIgcmVz dWx0OwogICAgIGJvb2wgbmVlZHNDb21tYSA9IGZhbHNlOwogCiAgICAgQVBQRU5EX0FSR1VNRU5U X05BTUUoR0NTX0NPTVBBVFRSKTsKQEAgLTEyNjUsNyArMTI2Niw3IEBAIHN0YXRpYyBTdHJpbmcg aW1lQ29tcG9zaXRpb25Bcmd1bWVudE5hbWVzKExQQVJBTSBscGFyYW0pCiAgICAgQVBQRU5EX0FS R1VNRU5UX05BTUUoQ1NfSU5TRVJUQ0hBUik7CiAgICAgQVBQRU5EX0FSR1VNRU5UX05BTUUoQ1Nf Tk9NT1ZFQ0FSRVQpOwogCi0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gcmVzdWx0LnRv U3RyaW5nKCk7CiB9CiAKIHN0YXRpYyBTdHJpbmcgaW1lUmVxdWVzdE5hbWUoV1BBUkFNIHdwYXJh bSkK