48903 2010-11-03 02:44:37 -0700 Replace ARRAYSIZE with WTF_ARRAY_LENGTH 2010-11-05 03:16:32 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 paroga paroga commit-queue ddkilzer oldest_to_newest 303951 0 paroga 2010-11-03 02:44:37 -0700 see patch 303953 1 72805 paroga 2010-11-03 02:47:36 -0700 Created attachment 72805 Patch 304815 2 72805 ddkilzer 2010-11-04 13:03:24 -0700 Comment on attachment 72805 Patch r=me 304842 3 72805 commit-queue 2010-11-04 13:43:23 -0700 Comment on attachment 72805 Patch Rejecting patch 72805 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=abarth-cq-sl', 'apply-attachment', '--force-clean', '--non-interactive', 72805]" exit_code: 2 Last 500 characters of output: ile WebCore/platform/win/DragDataWin.cpp patching file WebCore/platform/win/FileSystemWin.cpp patching file WebKit/efl/ChangeLog patching file WebKit/efl/WebCoreSupport/EditorClientEfl.cpp patching file WebKit/win/ChangeLog patching file WebKit/win/WebCoreSupport/WebChromeClient.cpp patching file WebKit/win/WebKitDLL.cpp patching file WebKit/win/WebView.cpp Failed to run "[u'/Users/abarth/git/webkit-queue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'David Kilzer', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/5150018 305199 4 72805 paroga 2010-11-05 03:16:18 -0700 Comment on attachment 72805 Patch Clearing flags on attachment: 72805 Manually committed r71401: <http://trac.webkit.org/changeset/71401> 305200 5 paroga 2010-11-05 03:16:32 -0700 All reviewed patches have been landed. Closing bug. 72805 2010-11-03 02:47:36 -0700 2010-11-05 03:16:18 -0700 Patch bug-48903.patch text/plain 14439 paroga aSsrZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggZDMwY2E3Yy4uZGI1MjQ3ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMC0xMS0wMyAgUGF0cmljayBH YW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlIEFSUkFZU0laRSB3aXRoIFdURl9BUlJBWV9M RU5HVEgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4 OTAzCisKKyAgICAgICAgKiBwbGF0Zm9ybS9VVUlELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNy ZWF0ZUNhbm9uaWNhbFVVSURTdHJpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0ZvbnRDYWNoZUNocm9taXVtV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRD YWNoZTo6Z2V0Rm9udERhdGFGb3JDaGFyYWN0ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy93aW4vRm9udENhY2hlV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYWNoZTo6 Z2V0TGFzdFJlc29ydEZhbGxiYWNrRm9udCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv d2luL0ljb25XaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SWNvbjo6Y3JlYXRlSWNvbkZvckZp bGVzKToKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vQ2xpcGJvYXJkVXRpbGl0aWVzV2luLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmdldFdlYkxvY0RhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL3dp bi9DbGlwYm9hcmRXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlR2xvYmFsSERyb3BD b250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUdsb2JhbEltYWdlRmlsZURlc2NyaXB0 b3IpOgorICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkV2luOjpmaWxlcyk6CisgICAgICAgIChX ZWJDb3JlOjpDbGlwYm9hcmRXaW46OndyaXRlVVJMKToKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4v RHJhZ0RhdGFXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0RhdGE6OmFzRmlsZW5hbWVz KToKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vRmlsZVN5c3RlbVdpbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpzYWZlQ3JlYXRlRmlsZSk6CisKIDIwMTAtMTEtMDMgIFpvbHRhbiBIZXJjemVnICA8 emhlcmN6ZWdAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUu CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL1VVSUQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9y bS9VVUlELmNwcAppbmRleCA1MjA4YmVlLi5lYjcyMWUwIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs YXRmb3JtL1VVSUQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vVVVJRC5jcHAKQEAgLTM5LDkg KzM5LDYgQEAKIAogI2lmIE9TKFdJTkRPV1MpCiAjaW5jbHVkZSA8b2JqYmFzZS5oPgotI2lmbmRl ZiBBUlJBWVNJWkUKLSNkZWZpbmUgQVJSQVlTSVpFKGEpICAgICAgICAgICAoc2l6ZW9mKGEpIC8g c2l6ZW9mKChhKVswXSkpCi0jZW5kaWYKICNlbGlmIE9TKERBUldJTikKICNpbmNsdWRlIDxDb3Jl Rm91bmRhdGlvbi9Db3JlRm91bmRhdGlvbi5oPgogI2VsaWYgT1MoTElOVVgpICYmICFQTEFURk9S TShDSFJPTUlVTSkKQEAgLTY5LDcgKzY2LDcgQEAgU3RyaW5nIGNyZWF0ZUNhbm9uaWNhbFVVSURT dHJpbmcoKQogICAgIGlmIChGQUlMRUQoaHIpKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAg ICAgd2NoYXJfdCB1dWlkU3RyWzQwXTsKLSAgICBpbnQgbnVtID0gU3RyaW5nRnJvbUdVSUQyKHV1 aWQsIHJlaW50ZXJwcmV0X2Nhc3Q8TFBPTEVTVFI+KHV1aWRTdHIpLCBBUlJBWVNJWkUodXVpZFN0 cikpOworICAgIGludCBudW0gPSBTdHJpbmdGcm9tR1VJRDIodXVpZCwgcmVpbnRlcnByZXRfY2Fz dDxMUE9MRVNUUj4odXVpZFN0ciksIFdURl9BUlJBWV9MRU5HVEgodXVpZFN0cikpOwogICAgIEFT U0VSVChudW0gPT0gMzkpOwogICAgIFN0cmluZyBjYW5vbmljYWxVdWlkU3RyID0gU3RyaW5nKHV1 aWRTdHIgKyAxLCBudW0gLSAzKS5sb3dlcigpOyAvLyByZW1vdmUgb3BlbmluZyBhbmQgY2xvc2lu ZyBicmFja2V0IGFuZCBtYWtlIGl0IGxvd2VyLgogICAgIEFTU0VSVChjYW5vbmljYWxVdWlkU3Ry W3V1aWRWZXJzaW9uSWRlbnRpZmllckluZGV4XSA9PSB1dWlkVmVyc2lvblJlcXVpcmVkKTsKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlQ2hy b21pdW1XaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2Fj aGVDaHJvbWl1bVdpbi5jcHAKaW5kZXggN2MzZTQ1MC4uMzg0YjFjNSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVDaHJvbWl1bVdpbi5jcHAK KysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVDaHJvbWl1 bVdpbi5jcHAKQEAgLTM5MSwxMCArMzkxLDEwIEBAIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBGb250 Q2FjaGU6OmdldEZvbnREYXRhRm9yQ2hhcmFjdGVycyhjb25zdCBGb250JiBmb250LCBjb25zCiAg ICAgaW50IG51bUZvbnRzID0gMDsKICAgICBpZiAoc2NyaXB0ID09IFVTQ1JJUFRfSEFOKSB7CiAg ICAgICAgIHBhblVuaUZvbnRzID0gY2prRm9udHM7Ci0gICAgICAgIG51bUZvbnRzID0gQVJSQVlT SVpFKGNqa0ZvbnRzKTsKKyAgICAgICAgbnVtRm9udHMgPSBXVEZfQVJSQVlfTEVOR1RIKGNqa0Zv bnRzKTsKICAgICB9IGVsc2UgewogICAgICAgICBwYW5VbmlGb250cyA9IGNvbW1vbkZvbnRzOwot ICAgICAgICBudW1Gb250cyA9IEFSUkFZU0laRShjb21tb25Gb250cyk7CisgICAgICAgIG51bUZv bnRzID0gV1RGX0FSUkFZX0xFTkdUSChjb21tb25Gb250cyk7CiAgICAgfQogICAgIC8vIEZvbnQg cmV0dXJuZWQgZnJvbSBHZXRGYWxsYmFja0ZhbWlseSBtYXkgbm90IGNvdmVyIHxjaGFyYWN0ZXJz fAogICAgIC8vIGJlY2F1c2UgaXQncyBiYXNlZCBvbiBzY3JpcHQgdG8gZm9udCBtYXBwaW5nLiBU aGlzIHByb2JsZW0gaXMKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu L0ZvbnRDYWNoZVdpbi5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2Fj aGVXaW4uY3BwCmluZGV4IDIyNDBmODAuLmU4MDAyNDUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDYWNoZVdpbi5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcApAQCAtMzMwLDcgKzMzMCw3IEBAIFNpbXBs ZUZvbnREYXRhKiBGb250Q2FjaGU6OmdldExhc3RSZXNvcnRGYWxsYmFja0ZvbnQoY29uc3QgRm9u dERlc2NyaXB0aW9uJiBmb250CiAgICAgICAgIEF0b21pY1N0cmluZygiQXJpYWwiKQogICAgIH07 CiAgICAgU2ltcGxlRm9udERhdGEqIHNpbXBsZUZvbnQ7Ci0gICAgZm9yIChpbnQgaSA9IDA7IGkg PCBBUlJBWVNJWkUoZmFsbGJhY2tGb250cyk7ICsraSkgeworICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgV1RGX0FSUkFZX0xFTkdUSChmYWxsYmFja0ZvbnRzKTsgKytpKSB7CiAgICAgICAgIGlm IChzaW1wbGVGb250ID0gZ2V0Q2FjaGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCBmYWxsYmFj a0ZvbnRzW2ldKSkgewogICAgICAgICAgICAgZmFsbGJhY2tGb250TmFtZSA9IGZhbGxiYWNrRm9u dHNbaV07CiAgICAgICAgICAgICByZXR1cm4gc2ltcGxlRm9udDsKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ljb25XaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy93aW4vSWNvbldpbi5jcHAKaW5kZXggMDU5NTllMC4uNGQ0ZDIxOSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vSWNvbldpbi5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vSWNvbldpbi5jcHAKQEAgLTY5LDcgKzY5LDcgQEAgUGFz c1JlZlB0cjxJY29uPiBJY29uOjpjcmVhdGVJY29uRm9yRmlsZXMoY29uc3QgVmVjdG9yPFN0cmlu Zz4mIGZpbGVuYW1lcykKICAgICByZXR1cm4gMDsKICNlbHNlCiAgICAgVENIQVIgYnVmZmVyW01B WF9QQVRIXTsgICAgCi0gICAgVUlOVCBsZW5ndGggPSA6OkdldFN5c3RlbURpcmVjdG9yeShidWZm ZXIsIEFSUkFZU0laRShidWZmZXIpKTsKKyAgICBVSU5UIGxlbmd0aCA9IDo6R2V0U3lzdGVtRGly ZWN0b3J5KGJ1ZmZlciwgV1RGX0FSUkFZX0xFTkdUSChidWZmZXIpKTsKICAgICBpZiAoIWxlbmd0 aCkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L3dpbi9DbGlwYm9hcmRVdGlsaXRpZXNXaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xp cGJvYXJkVXRpbGl0aWVzV2luLmNwcAppbmRleCAxOTg4OGJmLi5lYjFlNjU5IDEwMDY0NAotLS0g YS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9hcmRVdGlsaXRpZXNXaW4uY3BwCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vd2luL0NsaXBib2FyZFV0aWxpdGllc1dpbi5jcHAKQEAgLTg2LDEzICs4 NiwxMyBAQCBzdGF0aWMgYm9vbCBnZXRXZWJMb2NEYXRhKElEYXRhT2JqZWN0KiBkYXRhT2JqZWN0 LCBTdHJpbmcmIHVybCwgU3RyaW5nKiB0aXRsZSkKICAgICBpZiAoIWhkcm9wKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIURyYWdRdWVyeUZpbGVXKGhkcm9wLCAwLCBmaWxlbmFt ZSwgQVJSQVlTSVpFKGZpbGVuYW1lKSkpCisgICAgaWYgKCFEcmFnUXVlcnlGaWxlVyhoZHJvcCwg MCwgZmlsZW5hbWUsIFdURl9BUlJBWV9MRU5HVEgoZmlsZW5hbWUpKSkKICAgICAgICAgZ290byBl eGl0OwogCiAgICAgaWYgKF93Y3NpY21wKFBhdGhGaW5kRXh0ZW5zaW9uVyhmaWxlbmFtZSksIEwi LnVybCIpKQogICAgICAgICBnb3RvIGV4aXQ7ICAgIAogICAgIAotICAgIGlmICghR2V0UHJpdmF0 ZVByb2ZpbGVTdHJpbmdXKEwiSW50ZXJuZXRTaG9ydGN1dCIsIEwidXJsIiwgMCwgdXJsQnVmZmVy LCBBUlJBWVNJWkUodXJsQnVmZmVyKSwgZmlsZW5hbWUpKQorICAgIGlmICghR2V0UHJpdmF0ZVBy b2ZpbGVTdHJpbmdXKEwiSW50ZXJuZXRTaG9ydGN1dCIsIEwidXJsIiwgMCwgdXJsQnVmZmVyLCBX VEZfQVJSQVlfTEVOR1RIKHVybEJ1ZmZlciksIGZpbGVuYW1lKSkKICAgICAgICAgZ290byBleGl0 OwogICAgIAogICAgIGlmICh0aXRsZSkgewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS93 aW4vQ2xpcGJvYXJkV2luLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vd2luL0NsaXBib2FyZFdpbi5j cHAKaW5kZXggNDkwNjc5MC4uNDBkOWFiMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS93 aW4vQ2xpcGJvYXJkV2luLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlwYm9hcmRX aW4uY3BwCkBAIC0xOTYsNyArMTk2LDcgQEAgc3RhdGljIEhHTE9CQUwgY3JlYXRlR2xvYmFsSERy b3BDb250ZW50KGNvbnN0IEtVUkwmIHVybCwgU3RyaW5nJiBmaWxlTmFtZSwgU2hhcmUKICAgICB9 IGVsc2UgewogICAgICAgICBXQ0hBUiB0ZW1wUGF0aFtNQVhfUEFUSF07CiAgICAgICAgIFdDSEFS IGV4dGVuc2lvbltNQVhfUEFUSF07Ci0gICAgICAgIGlmICghOjpHZXRUZW1wUGF0aChBUlJBWVNJ WkUodGVtcFBhdGgpLCB0ZW1wUGF0aCkpCisgICAgICAgIGlmICghOjpHZXRUZW1wUGF0aChXVEZf QVJSQVlfTEVOR1RIKHRlbXBQYXRoKSwgdGVtcFBhdGgpKQogICAgICAgICAgICAgcmV0dXJuIDA7 CiAgICAgICAgIGlmICghOjpQYXRoQXBwZW5kKHRlbXBQYXRoLCBmaWxlTmFtZS5jaGFyYWN0ZXJz V2l0aE51bGxUZXJtaW5hdGlvbigpKSkKICAgICAgICAgICAgIHJldHVybiAwOwpAQCAtMjczLDcg KzI3Myw3IEBAIHN0YXRpYyBIR0xPQkFMIGNyZWF0ZUdsb2JhbEltYWdlRmlsZURlc2NyaXB0b3Io Y29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYKICAgICAgICAgcmV0dXJuIDA7CiAgICAg fQogCi0gICAgaW50IG1heFNpemUgPSBtaW4oZnNQYXRoLmxlbmd0aCgpLCBBUlJBWVNJWkUoZmdk LT5mZ2RbMF0uY0ZpbGVOYW1lKSk7CisgICAgaW50IG1heFNpemUgPSBtaW4oZnNQYXRoLmxlbmd0 aCgpLCBXVEZfQVJSQVlfTEVOR1RIKGZnZC0+ZmdkWzBdLmNGaWxlTmFtZSkpOwogICAgIENvcHlN ZW1vcnkoZmdkLT5mZ2RbMF0uY0ZpbGVOYW1lLCAoTFBDV1NUUilmc1BhdGguY2hhcmFjdGVycygp LCBtYXhTaXplICogc2l6ZW9mKFVDaGFyKSk7CiAgICAgR2xvYmFsVW5sb2NrKG1lbU9iaik7CiAg ICAgCkBAIC01MzYsNyArNTM2LDcgQEAgUGFzc1JlZlB0cjxGaWxlTGlzdD4gQ2xpcGJvYXJkV2lu OjpmaWxlcygpIGNvbnN0CiAgICAgV0NIQVIgZmlsZW5hbWVbTUFYX1BBVEhdOwogICAgIFVJTlQg ZmlsZUNvdW50ID0gRHJhZ1F1ZXJ5RmlsZVcoaGRyb3AsIDB4RkZGRkZGRkYsIDAsIDApOwogICAg IGZvciAoVUlOVCBpID0gMDsgaSA8IGZpbGVDb3VudDsgaSsrKSB7Ci0gICAgICAgIGlmICghRHJh Z1F1ZXJ5RmlsZVcoaGRyb3AsIGksIGZpbGVuYW1lLCBBUlJBWVNJWkUoZmlsZW5hbWUpKSkKKyAg ICAgICAgaWYgKCFEcmFnUXVlcnlGaWxlVyhoZHJvcCwgaSwgZmlsZW5hbWUsIFdURl9BUlJBWV9M RU5HVEgoZmlsZW5hbWUpKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBmaWxlcy0+ YXBwZW5kKEZpbGU6OmNyZWF0ZShyZWludGVycHJldF9jYXN0PFVDaGFyKj4oZmlsZW5hbWUpKSk7 CiAgICAgfQpAQCAtNjk4LDcgKzY5OCw3IEBAIHZvaWQgQ2xpcGJvYXJkV2luOjp3cml0ZVVSTChj b25zdCBLVVJMJiBrdXJsLCBjb25zdCBTdHJpbmcmIHRpdGxlU3RyLCBGcmFtZSopCiAgICAgZmdk LT5mZ2RbMF0uZHdGbGFncyA9IEZEX0ZJTEVTSVpFOwogICAgIGZnZC0+ZmdkWzBdLm5GaWxlU2l6 ZUxvdyA9IGNvbnRlbnQubGVuZ3RoKCk7CiAKLSAgICB1bnNpZ25lZCBtYXhTaXplID0gbWluKGZz UGF0aC5sZW5ndGgoKSwgQVJSQVlTSVpFKGZnZC0+ZmdkWzBdLmNGaWxlTmFtZSkpOworICAgIHVu c2lnbmVkIG1heFNpemUgPSBtaW4oZnNQYXRoLmxlbmd0aCgpLCBXVEZfQVJSQVlfTEVOR1RIKGZn ZC0+ZmdkWzBdLmNGaWxlTmFtZSkpOwogICAgIENvcHlNZW1vcnkoZmdkLT5mZ2RbMF0uY0ZpbGVO YW1lLCBmc1BhdGguY2hhcmFjdGVycygpLCBtYXhTaXplICogc2l6ZW9mKFVDaGFyKSk7CiAgICAg R2xvYmFsVW5sb2NrKHVybEZpbGVEZXNjcmlwdG9yKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS93aW4vRHJhZ0RhdGFXaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS93aW4vRHJhZ0Rh dGFXaW4uY3BwCmluZGV4IDA1ZjkxMDMuLjU2MzQ1ZTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vd2luL0RyYWdEYXRhV2luLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3dpbi9EcmFn RGF0YVdpbi5jcHAKQEAgLTcyLDcgKzcyLDcgQEAgdm9pZCBEcmFnRGF0YTo6YXNGaWxlbmFtZXMo VmVjdG9yPFN0cmluZz4mIHJlc3VsdCkgY29uc3QKIAogICAgIGNvbnN0IHVuc2lnbmVkIG51bUZp bGVzID0gRHJhZ1F1ZXJ5RmlsZVcoaGRyb3AsIDB4RkZGRkZGRkYsIDAsIDApOwogICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCBudW1GaWxlczsgaSsrKSB7Ci0gICAgICAgIGlmICghRHJhZ1F1 ZXJ5RmlsZVcoaGRyb3AsIDAsIGZpbGVuYW1lLCBBUlJBWVNJWkUoZmlsZW5hbWUpKSkKKyAgICAg ICAgaWYgKCFEcmFnUXVlcnlGaWxlVyhoZHJvcCwgMCwgZmlsZW5hbWUsIFdURl9BUlJBWV9MRU5H VEgoZmlsZW5hbWUpKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICByZXN1bHQuYXBw ZW5kKChVQ2hhciopZmlsZW5hbWUpOwogICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv cm0vd2luL0ZpbGVTeXN0ZW1XaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS93aW4vRmlsZVN5c3Rl bVdpbi5jcHAKaW5kZXggMmNjYTA4Yy4uY2VmNzE5NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS93aW4vRmlsZVN5c3RlbVdpbi5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS93aW4vRmls ZVN5c3RlbVdpbi5jcHAKQEAgLTI3NCw3ICsyNzQsNyBAQCBib29sIHNhZmVDcmVhdGVGaWxlKGNv bnN0IFN0cmluZyYgcGF0aCwgQ0ZEYXRhUmVmIGRhdGEpCiB7CiAgICAgLy8gQ3JlYXRlIGEgdGVt cG9yYXJ5IGZpbGUuCiAgICAgV0NIQVIgdGVtcERpclBhdGhbTUFYX1BBVEhdOwotICAgIGlmICgh R2V0VGVtcFBhdGhXKEFSUkFZU0laRSh0ZW1wRGlyUGF0aCksIHRlbXBEaXJQYXRoKSkKKyAgICBp ZiAoIUdldFRlbXBQYXRoVyhXVEZfQVJSQVlfTEVOR1RIKHRlbXBEaXJQYXRoKSwgdGVtcERpclBh dGgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBXQ0hBUiB0ZW1wUGF0aFtNQVhfUEFU SF07CmRpZmYgLS1naXQgYS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1dlYktpdC9lZmwvQ2hhbmdl TG9nCmluZGV4IDlkMDAyZjYuLjE2ZGZjMzggMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvQ2hhbmdl TG9nCisrKyBiL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMTEt MDMgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBBUlJBWVNJWkUgd2l0 aCBXVEZfQVJSQVlfTEVOR1RICisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00ODkwMworCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50 RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvckNsaWVudEVmbDo6aW50ZXJwcmV0S2V5 RXZlbnQpOgorCiAyMDEwLTExLTAzICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAcmltLmNvbT4KIAog ICAgICAgICBGb3IgdW5uYW1lZCBmcmFtZXMsIHdpbmRvdy5uYW1lIHJldHVybnMgYSBnZW5lcmF0 ZWQgbmFtZQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGll bnRFZmwuY3BwIGIvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRFZmwuY3Bw CmluZGV4IGE2M2I3MTIuLjMwODU1ZjIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvV2ViQ29yZVN1 cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcAorKysgYi9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0 L0VkaXRvckNsaWVudEVmbC5jcHAKQEAgLTI5Miw4ICsyOTIsNiBAQCBzdGF0aWMgY29uc3QgS2V5 UHJlc3NFbnRyeSBrZXlQcmVzc0VudHJpZXNbXSA9IHsKICAgICB7ICdccicsICAgQWx0S2V5IHwg U2hpZnRLZXksICAiSW5zZXJ0TmV3bGluZSIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg fSwKIH07CiAKLSNkZWZpbmUgQVJSQVlTSVpFKGFycmF5KSAoc2l6ZW9mKGFycmF5KSAvIHNpemVv ZigoYXJyYXkpWzBdKSkKLQogY29uc3QgY2hhciogRWRpdG9yQ2xpZW50RWZsOjppbnRlcnByZXRL ZXlFdmVudChjb25zdCBLZXlib2FyZEV2ZW50KiBldmVudCkKIHsKICAgICBBU1NFUlQoZXZlbnQt PnR5cGUoKSA9PSBldmVudE5hbWVzKCkua2V5ZG93bkV2ZW50IHx8IGV2ZW50LT50eXBlKCkgPT0g ZXZlbnROYW1lcygpLmtleXByZXNzRXZlbnQpOwpAQCAtMzA1LDEwICszMDMsMTAgQEAgY29uc3Qg Y2hhciogRWRpdG9yQ2xpZW50RWZsOjppbnRlcnByZXRLZXlFdmVudChjb25zdCBLZXlib2FyZEV2 ZW50KiBldmVudCkKICAgICAgICAga2V5RG93bkNvbW1hbmRzTWFwID0gbmV3IEhhc2hNYXA8aW50 LCBjb25zdCBjaGFyKj47CiAgICAgICAgIGtleVByZXNzQ29tbWFuZHNNYXAgPSBuZXcgSGFzaE1h cDxpbnQsIGNvbnN0IGNoYXIqPjsKIAotICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg QVJSQVlTSVpFKGtleURvd25FbnRyaWVzKTsgaSsrKQorICAgICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IFdURl9BUlJBWV9MRU5HVEgoa2V5RG93bkVudHJpZXMpOyArK2kpCiAgICAgICAgICAg ICBrZXlEb3duQ29tbWFuZHNNYXAtPnNldChrZXlEb3duRW50cmllc1tpXS5tb2RpZmllcnMgPDwg MTYgfCBrZXlEb3duRW50cmllc1tpXS52aXJ0dWFsS2V5LCBrZXlEb3duRW50cmllc1tpXS5uYW1l KTsKIAotICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgQVJSQVlTSVpFKGtleVByZXNz RW50cmllcyk7IGkrKykKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBXVEZfQVJSQVlf TEVOR1RIKGtleVByZXNzRW50cmllcyk7ICsraSkKICAgICAgICAgICAgIGtleVByZXNzQ29tbWFu ZHNNYXAtPnNldChrZXlQcmVzc0VudHJpZXNbaV0ubW9kaWZpZXJzIDw8IDE2IHwga2V5UHJlc3NF bnRyaWVzW2ldLmNoYXJDb2RlLCBrZXlQcmVzc0VudHJpZXNbaV0ubmFtZSk7CiAgICAgfQogCmRp ZmYgLS1naXQgYS9XZWJLaXQvd2luL0NoYW5nZUxvZyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCmlu ZGV4IGNjMzBhYmYuLjk3N2E0OTIgMTAwNjQ0Ci0tLSBhL1dlYktpdC93aW4vQ2hhbmdlTG9nCisr KyBiL1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMTEtMDMgIFBh dHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBBUlJBWVNJWkUgd2l0aCBXVEZf QVJSQVlfTEVOR1RICisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00ODkwMworCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNw cDoKKyAgICAgICAgKFdlYkNocm9tZUNsaWVudDo6ZXhjZWVkZWREYXRhYmFzZVF1b3RhKToKKyAg ICAgICAgKiBXZWJLaXRETEwuY3BwOgorICAgICAgICAoRGxsR2V0Q2xhc3NPYmplY3QpOgorICAg ICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6bW91c2VXaGVlbCk6CisKIDIw MTAtMTEtMDIgIERhbmllbCBCYXRlcyAgPGRiYXRlc0ByaW0uY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0 L1dlYkNocm9tZUNsaWVudC5jcHAgYi9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5jcHAKaW5kZXggYjEzMzJlZC4uZWJlYTc4NiAxMDA2NDQKLS0tIGEvV2ViS2l0L3dp bi9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCisrKyBiL1dlYktpdC93aW4vV2Vi Q29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcApAQCAtNTkyLDcgKzU5Miw3IEBAIHZvaWQg V2ViQ2hyb21lQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXVvdGEoRnJhbWUqIGZyYW1lLCBjb25z dCBTdHJpbmcmIGRhdGFiYXNlCiAgICAgICAgICAgICBITU9EVUxFIHNhZmFyaUhhbmRsZSA9IEdl dE1vZHVsZUhhbmRsZShURVhUKCJTYWZhcmkuZXhlIikpOwogICAgICAgICAgICAgaWYgKCFzYWZh cmlIYW5kbGUpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgR2V0TW9kdWxl RmlsZU5hbWUoc2FmYXJpSGFuZGxlLCBwYXRoLCBBUlJBWVNJWkUocGF0aCkpOworICAgICAgICAg ICAgR2V0TW9kdWxlRmlsZU5hbWUoc2FmYXJpSGFuZGxlLCBwYXRoLCBXVEZfQVJSQVlfTEVOR1RI KHBhdGgpKTsKICAgICAgICAgICAgIERXT1JEIGhhbmRsZTsKICAgICAgICAgICAgIERXT1JEIHZl cnNpb25TaXplID0gR2V0RmlsZVZlcnNpb25JbmZvU2l6ZShwYXRoLCAmaGFuZGxlKTsKICAgICAg ICAgICAgIGlmICghdmVyc2lvblNpemUpCmRpZmYgLS1naXQgYS9XZWJLaXQvd2luL1dlYktpdERM TC5jcHAgYi9XZWJLaXQvd2luL1dlYktpdERMTC5jcHAKaW5kZXggZjhhYTI2MS4uYmM3YWE2MCAx MDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9XZWJLaXRETEwuY3BwCisrKyBiL1dlYktpdC93aW4vV2Vi S2l0RExMLmNwcApAQCAtNzgsNyArNzgsNyBAQCBTVERBUElfKEJPT0wpIERsbE1haW4oIEhNT0RV TEUgaE1vZHVsZSwgRFdPUkQgIHVsX3JlYXNvbl9mb3JfY2FsbCwgTFBWT0lEIC8qbHBSZQogU1RE QVBJIERsbEdldENsYXNzT2JqZWN0KFJFRkNMU0lEIHJjbHNpZCwgUkVGSUlEIHJpaWQsIExQVk9J RCogcHB2KQogewogICAgIGJvb2wgZm91bmQgPSBmYWxzZTsKLSAgICBmb3IgKGludCBpID0gMDsg aSA8IEFSUkFZU0laRShnUmVnQ0xTSURzKTsgaSsrKSB7CisgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBXVEZfQVJSQVlfTEVOR1RIKGdSZWdDTFNJRHMpOyArK2kpIHsKICAgICAgICAgaWYgKElz RXF1YWxHVUlEKHJjbHNpZCwgZ1JlZ0NMU0lEc1tpXSkpIHsKICAgICAgICAgICAgIGZvdW5kID0g dHJ1ZTsKICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9XZWJWaWV3 LmNwcCBiL1dlYktpdC93aW4vV2ViVmlldy5jcHAKaW5kZXggZmI2MjgwOS4uZTk5YjlkYSAxMDA2 NDQKLS0tIGEvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAorKysgYi9XZWJLaXQvd2luL1dlYlZpZXcu Y3BwCkBAIC0xNjM0LDkgKzE2MzQsOSBAQCBib29sIFdlYlZpZXc6Om1vdXNlV2hlZWwoV1BBUkFN IHdQYXJhbSwgTFBBUkFNIGxQYXJhbSwgYm9vbCBpc01vdXNlSFdoZWVsKQogICAgICAgICBUQ0hB UiBjbGFzc05hbWVbMjU2XTsKIAogICAgICAgICAvLyBNYWtlIHN1cmUgdHJ1bmNhdGlvbiB3b24n dCBhZmZlY3QgdGhlIGNvbXBhcmlzb24uCi0gICAgICAgIEFTU0VSVChBUlJBWVNJWkUoY2xhc3NO YW1lKSA+IF90Y3NsZW4oUG9wdXBNZW51V2luOjpwb3B1cENsYXNzTmFtZSgpKSk7CisgICAgICAg IEFTU0VSVChXVEZfQVJSQVlfTEVOR1RIKGNsYXNzTmFtZSkgPiBfdGNzbGVuKFBvcHVwTWVudVdp bjo6cG9wdXBDbGFzc05hbWUoKSkpOwogCi0gICAgICAgIGlmIChHZXRDbGFzc05hbWUoZm9jdXNl ZFdpbmRvdywgY2xhc3NOYW1lLCBBUlJBWVNJWkUoY2xhc3NOYW1lKSkgJiYgIV90Y3NjbXAoY2xh c3NOYW1lLCBQb3B1cE1lbnVXaW46OnBvcHVwQ2xhc3NOYW1lKCkpKSB7CisgICAgICAgIGlmIChH ZXRDbGFzc05hbWUoZm9jdXNlZFdpbmRvdywgY2xhc3NOYW1lLCBXVEZfQVJSQVlfTEVOR1RIKGNs YXNzTmFtZSkpICYmICFfdGNzY21wKGNsYXNzTmFtZSwgUG9wdXBNZW51V2luOjpwb3B1cENsYXNz TmFtZSgpKSkgewogICAgICAgICAgICAgLy8gV2UgZG9uJ3QgbGV0IHRoZSBXZWJWaWV3IHNjcm9s bCBoZXJlIGZvciB0d28gcmVhc29ucyAtIDEpIFRvIG1hdGNoIEZpcmVmb3ggYmVoYXZpb3IsIDIp IElmIHdlIGRvIHNjcm9sbCwgd2UgbG9zZSB0aGUKICAgICAgICAgICAgIC8vIGZvY3VzIHJpbmcg YXJvdW5kIHRoZSBzZWxlY3QgbWVudS4KICAgICAgICAgICAgIFNldEZvY3VzKG1fdmlld1dpbmRv dyk7CkBAIC0yMzMxLDcgKzIzMzEsNyBAQCBzdGF0aWMgU3RyaW5nIHdlYktpdFZlcnNpb24oKQog ICAgIH0gKmxwVHJhbnNsYXRlOwogCiAgICAgVENIQVIgcGF0aFtNQVhfUEFUSF07Ci0gICAgR2V0 TW9kdWxlRmlsZU5hbWUoZ0luc3RhbmNlLCBwYXRoLCBBUlJBWVNJWkUocGF0aCkpOworICAgIEdl dE1vZHVsZUZpbGVOYW1lKGdJbnN0YW5jZSwgcGF0aCwgV1RGX0FSUkFZX0xFTkdUSChwYXRoKSk7 CiAgICAgRFdPUkQgaGFuZGxlOwogICAgIERXT1JEIHZlcnNpb25TaXplID0gR2V0RmlsZVZlcnNp b25JbmZvU2l6ZShwYXRoLCAmaGFuZGxlKTsKICAgICBpZiAoIXZlcnNpb25TaXplKQpAQCAtMjM0 NSw3ICsyMzQ1LDcgQEAgc3RhdGljIFN0cmluZyB3ZWJLaXRWZXJzaW9uKCkKICAgICBpZiAoIVZl clF1ZXJ5VmFsdWUoZGF0YSwgVEVYVCgiXFxWYXJGaWxlSW5mb1xcVHJhbnNsYXRpb24iKSwgKExQ Vk9JRCopJmxwVHJhbnNsYXRlLCAmY2JUcmFuc2xhdGUpKQogICAgICAgICBnb3RvIGV4aXQ7CiAg ICAgVENIQVIga2V5WzI1Nl07Ci0gICAgX3N0cHJpbnRmX3Moa2V5LCBBUlJBWVNJWkUoa2V5KSwg VEVYVCgiXFxTdHJpbmdGaWxlSW5mb1xcJTA0eCUwNHhcXFByb2R1Y3RWZXJzaW9uIiksIGxwVHJh bnNsYXRlWzBdLndMYW5ndWFnZSwgbHBUcmFuc2xhdGVbMF0ud0NvZGVQYWdlKTsKKyAgICBfc3Rw cmludGZfcyhrZXksIFdURl9BUlJBWV9MRU5HVEgoa2V5KSwgVEVYVCgiXFxTdHJpbmdGaWxlSW5m b1xcJTA0eCUwNHhcXFByb2R1Y3RWZXJzaW9uIiksIGxwVHJhbnNsYXRlWzBdLndMYW5ndWFnZSwg bHBUcmFuc2xhdGVbMF0ud0NvZGVQYWdlKTsKICAgICBMUENUU1RSIHByb2R1Y3RWZXJzaW9uOwog ICAgIFVJTlQgcHJvZHVjdFZlcnNpb25MZW5ndGg7CiAgICAgaWYgKCFWZXJRdWVyeVZhbHVlKGRh dGEsIChMUFRTVFIpKExQQ1RTVFIpa2V5LCAodm9pZCoqKSZwcm9kdWN0VmVyc2lvbiwgJnByb2R1 Y3RWZXJzaW9uTGVuZ3RoKSkK