7656 2006-03-08 00:09:13 -0800 Query string always appended to Flash URLs, instead of being replaced 2006-03-13 05:35:45 -0800 1 1 1 Unclassified WebKit Plug-ins 420+ Mac OS X 10.4 RESOLVED FIXED http://ifparty.scenesp.org/06/ P2 Normal --- 1 listas webkit-unassigned ap peter oldest_to_newest 35494 0 listas 2006-03-08 00:09:13 -0800 When clicking on any of the options of the menu, the url gets appended a new ?section, instead of replacing the old one. Sometimes safari gets stuck in a loop and fails with a message which says "Redirection limit exceeded". It can look like this: Safari can’t open the page. Too many redirects occurred trying to open “http://ifparty.scenesp.org/06/?section=news?section=about?section=press?section=register?section=news?section=press?section=contact?section=compos?section=press?section=press?section=about?section=news?section=about?section=press?section=register?section=news?section=press?section=contact?section=compos?section=press?section=press?section=about&language=sp?.... (this string is longer, fills all the browser page) This page works properly on any other browsers we have tested: firefox mac/pc, explorer... I have been looking at the code of the page and it uses lots of redirections (302), but I haven't found any reference to safari bugs with 302 redirections. Sorry if the bug is repeated... 35522 1 ap 2006-03-08 06:38:57 -0800 I can confirm the URL issue. It has been reported before (bug 5475), but that case was unreproducible. Setting severity to normal - blocker severity is for bugs that block WebKit development. I didn't see the "Redirection limit exceeded" problem. Please file a separate bug for it, if it is reproducible with a current nightly build from <http://nightly.webkit.org>. 35528 2 6941 ap 2006-03-08 08:18:25 -0800 Created attachment 6941 proposed fix This doesn't attempt to fix any redirection problems. 35535 3 6941 darin 2006-03-08 09:05:20 -0800 Comment on attachment 6941 proposed fix This patch looks very good. It needs a change log and a layout test, so I'm marking it review-. I believe we can test this with a layout test. 35551 4 6945 ap 2006-03-08 11:34:14 -0800 Created attachment 6945 fix with test and ChangeLog Making a layout test was harder than fixing the bug, but not as hard as I expected :) 35571 5 6945 darin 2006-03-08 16:29:37 -0800 Comment on attachment 6945 fix with test and ChangeLog + NPUTF8 urlString[size]; You should use malloc here instead of using the gcc extension that allows variable sized arrays. Maybe strdup is the best way. But that's in test code. Looks great, r=me. 35587 6 ap 2006-03-08 21:55:39 -0800 Aren't variable sized arrays a standard C99 feature now? I landed as is, although I believe that having 5 lines of code just to append a trailing zero to each string parameter doesn't look good; we'll likely want to rewrite this anyway, as the number of supported methods grows. 36102 7 ap 2006-03-13 05:35:45 -0800 *** Bug 5475 has been marked as a duplicate of this bug. *** 6941 2006-03-08 08:18:25 -0800 2006-03-08 11:34:14 -0800 proposed fix 7656r1_patch.txt text/plain 2446 ap SW5kZXg6IE1pc2MvV2ViTlNVUkxFeHRyYXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBNaXNjL1dlYk5TVVJM RXh0cmFzLmgJKHJldmlzaW9uIDEzMjA5KQorKysgTWlzYy9XZWJOU1VSTEV4dHJhcy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01Nyw2ICs1Nyw3IEBACiAKIC0gKE5TVVJMICopX3dlYmtpdF9jYW5vbmlj YWxpemU7CiAtIChOU1VSTCAqKV93ZWJraXRfVVJMQnlSZW1vdmluZ0ZyYWdtZW50OworLSAoTlNV UkwgKilfd2Via2l0X1VSTEJ5UmVtb3ZpbmdSZXNvdXJjZVNwZWNpZmllcjsKIAogLSAoQk9PTClf d2Via2l0X2lzSmF2YVNjcmlwdFVSTDsKIC0gKE5TU3RyaW5nICopX3dlYmtpdF9zY3JpcHRJZkph dmFTY3JpcHRVUkw7CkluZGV4OiBNaXNjL1dlYk5TVVJMRXh0cmFzLm0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TWlzYy9XZWJOU1VSTEV4dHJhcy5tCShyZXZpc2lvbiAxMzIwOSkKKysrIE1pc2MvV2ViTlNVUkxF eHRyYXMubQkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQg KEMpIDIwMDUgQXBwbGUgQ29tcHV0ZXIsIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMDYgQWxleGV5IFByb3NrdXJ5YWtvdiAoYXBAbnlwb3AuY29tKQogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zNjQsNiArMzY1LDkgQEAgc3RhdGljIE5T U3RyaW5nICptYXBIb3N0TmFtZXMoTlNTdHJpbmcgKgogICAgIE5TVVJMICpyZXN1bHQgPSBuaWw7 CiAgICAgaW50IGxlbmd0aCA9IFtkYXRhIGxlbmd0aF07CiAgICAgaWYgKGxlbmd0aCA+IDApIHsK KyAgICAgICAgLy8gd29yayBhcm91bmQgPHJkYXI6Ly80NDcwNzcxPjogQ0ZVUkxDcmVhdGVBYnNv bHV0ZVVSTFdpdGhCeXRlcyguLiwgVFJVRSkgZG9lc24ndCByZW1vdmUgbm9uLXBhdGggY29tcG9u ZW50cy4KKyAgICAgICAgYmFzZVVSTCA9IFtiYXNlVVJMIF93ZWJraXRfVVJMQnlSZW1vdmluZ1Jl c291cmNlU3BlY2lmaWVyXTsKKyAgICAKICAgICAgICAgY29uc3QgVUludDggKmJ5dGVzID0gW2Rh dGEgYnl0ZXNdOwogICAgICAgICAvLyBOT1RFOiBXZSB1c2UgVVRGLTggaGVyZSBzaW5jZSB0aGlz IGVuY29kaW5nIGlzIHVzZWQgd2hlbiBjb21wdXRpbmcgc3RyaW5ncyB3aGVuIHJldHVybmluZyBV UkwgY29tcG9uZW50cwogICAgICAgICAvLyAoZS5nIGNhbGxzIHRvIE5TVVJMIC1wYXRoKS4gSG93 ZXZlciwgdGhpcyBmdW5jdGlvbiBpcyBub3QgdG9sZXJhbnQgb2YgaWxsZWdhbCBVVEYtOCBzZXF1 ZW5jZXMsIHdoaWNoCkBAIC01MzksOSArNTQzLDkgQEAgdHlwZWRlZiBzdHJ1Y3QgewogCiAKIAot LSAoTlNVUkwgKilfd2Via2l0X1VSTEJ5UmVtb3ZpbmdGcmFnbWVudAorLSAoTlNVUkwgKilfd2Vi a2l0X1VSTEJ5UmVtb3ZpbmdDb21wb25lbnQ6KENGVVJMQ29tcG9uZW50VHlwZSljb21wb25lbnQK IHsKLSAgICBDRlJhbmdlIGZyYWdSZyA9IENGVVJMR2V0Qnl0ZVJhbmdlRm9yQ29tcG9uZW50KChD RlVSTFJlZilzZWxmLCBrQ0ZVUkxDb21wb25lbnRGcmFnbWVudCwgTlVMTCk7CisgICAgQ0ZSYW5n ZSBmcmFnUmcgPSBDRlVSTEdldEJ5dGVSYW5nZUZvckNvbXBvbmVudCgoQ0ZVUkxSZWYpc2VsZiwg Y29tcG9uZW50LCBOVUxMKTsKICAgICAvLyBDaGVjayB0byBzZWUgaWYgYSBmcmFnbWVudCBleGlz dHMgYmVmb3JlIGRlY29tcG9zaW5nIHRoZSBVUkwuCiAgICAgaWYgKGZyYWdSZy5sb2NhdGlvbiA9 PSBrQ0ZOb3RGb3VuZCkgewogICAgICAgICByZXR1cm4gc2VsZjsKQEAgLTU2NSw2ICs1NjksMTYg QEAgdHlwZWRlZiBzdHJ1Y3QgewogICAgIHJldHVybiByZXN1bHQgPyBbcmVzdWx0IGF1dG9yZWxl YXNlXSA6IHNlbGY7CiB9CiAKKy0gKE5TVVJMICopX3dlYmtpdF9VUkxCeVJlbW92aW5nRnJhZ21l bnQKK3sKKyAgICByZXR1cm4gW3NlbGYgX3dlYmtpdF9VUkxCeVJlbW92aW5nQ29tcG9uZW50OmtD RlVSTENvbXBvbmVudEZyYWdtZW50XTsKK30KKworLSAoTlNVUkwgKilfd2Via2l0X1VSTEJ5UmVt b3ZpbmdSZXNvdXJjZVNwZWNpZmllcgoreworICAgIHJldHVybiBbc2VsZiBfd2Via2l0X1VSTEJ5 UmVtb3ZpbmdDb21wb25lbnQ6a0NGVVJMQ29tcG9uZW50UmVzb3VyY2VTcGVjaWZpZXJdOworfQor CiAtIChCT09MKV93ZWJraXRfaXNKYXZhU2NyaXB0VVJMCiB7CiAgICAgcmV0dXJuIFtbc2VsZiBf d2ViX29yaWdpbmFsRGF0YUFzU3RyaW5nXSBfd2Via2l0X2lzSmF2YVNjcmlwdFVSTF07Cg== 6945 2006-03-08 11:34:14 -0800 2006-03-08 16:29:37 -0800 fix with test and ChangeLog 7656r2_patch.txt text/plain 8418 ap SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDEzMjE0KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDYtMDMtMDggIEFsZXhleSBQcm9za3VyeWFr b3YgIDxhcEBueXBvcC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgLSBUZXN0cyBmb3IgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3No b3dfYnVnLmNnaT9pZD03NjU2CisgICAgICAgICBRdWVyeSBzdHJpbmcgYWx3YXlzIGFwcGVuZGVk IHRvIEZsYXNoIFVSTHMsIGluc3RlYWQgb2YgYmVpbmcgcmVwbGFjZWQuCisKKyAgICAgICAgKiBw bHVnaW5zL2dldHVybC1yZXBsYWNlLXF1ZXJ5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogcGx1Z2lucy9nZXR1cmwtcmVwbGFjZS1xdWVyeS5odG1sOiBBZGRlZC4KKwogMjAwNi0wMy0w NyAgSnVzdGluIEdhcmNpYSAgPGp1c3Rpbi5nYXJjaWFAYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IGhhcnJpc29uCkluZGV4OiBMYXlvdXRUZXN0cy9wbHVnaW5zL2dldHVybC1yZXBs YWNlLXF1ZXJ5Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGx1Z2lucy9nZXR1cmwt cmVwbGFjZS1xdWVyeS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGx1Z2lucy9n ZXR1cmwtcmVwbGFjZS1xdWVyeS5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM2IEBACis8 aHRtbD4KKzxib2R5PgorPGVtYmVkIG5hbWU9InBsZyIgdHlwZT0iYXBwbGljYXRpb24veC13ZWJr aXQtdGVzdC1uZXRzY2FwZSI+PC9lbWJlZD4KKzxwPlRlc3QgZm9yIDxhIGhyZWY9Imh0dHA6Ly9i dWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY1NiI+YnVnIDc2NTY8YS8+ OgorUXVlcnkgc3RyaW5nIGFsd2F5cyBhcHBlbmRlZCB0byBGbGFzaCBVUkxzLCBpbnN0ZWFkIG9m IGJlaW5nIHJlcGxhY2VkPC9wPgorPHNjcmlwdD4KKyAgICBpZiAod2luZG93LmxheW91dFRlc3RD b250cm9sbGVyKSB7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsK KyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOworICAgIH0KKyAg ICAKKyAgICB0cnkgeworICAgICAgICAKKyAgICAgICAgbG9jID0gd2luZG93LmxvY2F0aW9uLmhy ZWY7CisgICAgICAgIAorICAgICAgICBpZiAobG9jLmluZGV4T2YoJz8nKSA9PSAtMSkgeworICAg ICAgICAgICAgd2luZG93LmxvY2F0aW9uLmhyZWYgPSBsb2MgKyAiPzEiOworICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgCisgICAgICAgICAgICBpZiAobG9jLnN1YnN0cmluZyhsb2MuaW5k ZXhPZignPycpLCBsb2MubGVuZ3RoKSA9PSAiPzEiKSB7CisgICAgICAgICAgICAgICAgcGxnLmdl dFVSTCgiPzIiLCAiX3NlbGYiKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAg ICAgcXVlcnkgPSBsb2Muc3Vic3RyaW5nKGxvYy5pbmRleE9mKCc/JyksIGxvYy5sZW5ndGgpOwor ICAgICAgICAgICAgICAgIGRvY3VtZW50LndyaXRlKHF1ZXJ5ID09ICI/MiIgPyAKKyAgICAgICAg ICAgICAgICAgICAgIlNVQ0NFU1MiIDogIkZBSUxVUkU6ICIgKyBxdWVyeSk7CisgICAgICAgICAg ICAgICAgCisgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikK KyAgICAgICAgICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOwor ICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfSBjYXRjaCAoZXgpIHsKKyAgICAgICAgYWxl cnQoIkV4Y2VwdGlvbjogIiArIGV4LmRlc2NyaXB0aW9uKTsKKyAgICB9Cis8L3NjcmlwdD4KKzwv Ym9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL3BsdWdpbnMvZ2V0dXJsLXJlcGxhY2Ut cXVlcnktZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsdWdpbnMvZ2V0 dXJsLXJlcGxhY2UtcXVlcnktZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVz dHMvcGx1Z2lucy9nZXR1cmwtcmVwbGFjZS1xdWVyeS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsNCBAQAorCitUZXN0IGZvciBidWcgNzY1NjogUXVlcnkgc3RyaW5nIGFsd2F5 cyBhcHBlbmRlZCB0byBGbGFzaCBVUkxzLCBpbnN0ZWFkIG9mIGJlaW5nIHJlcGxhY2VkCisKK1NV Q0NFU1MKSW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L0NoYW5n ZUxvZwkocmV2aXNpb24gMTMyMTQpCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTggQEAKKzIwMDYtMDMtMDggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBu eXBvcC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgLSBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTc2NTYK KyAgICAgICAgIFF1ZXJ5IHN0cmluZyBhbHdheXMgYXBwZW5kZWQgdG8gRmxhc2ggVVJMcywgaW5z dGVhZCBvZiBiZWluZyByZXBsYWNlZC4KKworICAgICAgICAqIE1pc2MvV2ViTlNVUkxFeHRyYXMu aDogQWRkZWQgX3dlYmtpdF9VUkxCeVJlbW92aW5nUmVzb3VyY2VTcGVjaWZpZXIuCisgICAgICAg ICogTWlzYy9XZWJOU1VSTEV4dHJhcy5tOgorICAgICAgICAoK1tOU1VSTCBfd2ViX1VSTFdpdGhE YXRhOnJlbGF0aXZlVG9VUkw6XSk6IENhbGwgX3dlYmtpdF9VUkxCeVJlbW92aW5nUmVzb3VyY2VT cGVjaWZpZXIgdG8KKyAgICAgICAgd29yayBhcm91bmQgQ0ZVUkwgbm90IHJlbW92aW5nIG5vbi1w YXRoIGNvbXBvbmVudHMgZnJvbSBiYXNlIFVSTHMgaW4gc29tZSBjYXNlcy4KKyAgICAgICAgKC1b TlNVUkwgX3dlYmtpdF9VUkxCeVJlbW92aW5nQ29tcG9uZW50Ol0pOiBOZXcgZ2VuZXJpYyBmdW5j dGlvbiBmb3IgcmVtb3ZpbmcgVVJMIGNvbXBvbmVudHMuCisgICAgICAgICgtW05TVVJMIF93ZWJr aXRfVVJMQnlSZW1vdmluZ0ZyYWdtZW50XSk6IE1vdmVkIGltcGxlbWVudGF0aW9uIHRvIHRoZSBh Ym92ZSBtZXRob2QuCisgICAgICAgICgtW05TVVJMIF93ZWJraXRfVVJMQnlSZW1vdmluZ1Jlc291 cmNlU3BlY2lmaWVyXSk6IEFkZGVkLgorCiAyMDA2LTAzLTA3ICBEYXJpbiBBZGxlciAgPGRhcmlu QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMuCkluZGV4OiBXZWJLaXQv TWlzYy9XZWJOU1VSTEV4dHJhcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9NaXNjL1dlYk5TVVJM RXh0cmFzLmgJKHJldmlzaW9uIDEzMjA5KQorKysgV2ViS2l0L01pc2MvV2ViTlNVUkxFeHRyYXMu aAkod29ya2luZyBjb3B5KQpAQCAtNTcsNiArNTcsNyBAQAogCiAtIChOU1VSTCAqKV93ZWJraXRf Y2Fub25pY2FsaXplOwogLSAoTlNVUkwgKilfd2Via2l0X1VSTEJ5UmVtb3ZpbmdGcmFnbWVudDsK Ky0gKE5TVVJMICopX3dlYmtpdF9VUkxCeVJlbW92aW5nUmVzb3VyY2VTcGVjaWZpZXI7CiAKIC0g KEJPT0wpX3dlYmtpdF9pc0phdmFTY3JpcHRVUkw7CiAtIChOU1N0cmluZyAqKV93ZWJraXRfc2Ny aXB0SWZKYXZhU2NyaXB0VVJMOwpJbmRleDogV2ViS2l0L01pc2MvV2ViTlNVUkxFeHRyYXMubQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvTWlzYy9XZWJOU1VSTEV4dHJhcy5tCShyZXZpc2lvbiAxMzIw OSkKKysrIFdlYktpdC9NaXNjL1dlYk5TVVJMRXh0cmFzLm0JKHdvcmtpbmcgY29weSkKQEAgLTEs NSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDA1IEFwcGxlIENvbXB1dGVyLCBJbmMu ICBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA2IEFsZXhleSBQcm9z a3VyeWFrb3YgKGFwQG55cG9wLmNvbSkKICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpA QCAtMzY0LDYgKzM2NSw5IEBAIHN0YXRpYyBOU1N0cmluZyAqbWFwSG9zdE5hbWVzKE5TU3RyaW5n ICoKICAgICBOU1VSTCAqcmVzdWx0ID0gbmlsOwogICAgIGludCBsZW5ndGggPSBbZGF0YSBsZW5n dGhdOwogICAgIGlmIChsZW5ndGggPiAwKSB7CisgICAgICAgIC8vIHdvcmsgYXJvdW5kIDxyZGFy Oi8vNDQ3MDc3MT46IENGVVJMQ3JlYXRlQWJzb2x1dGVVUkxXaXRoQnl0ZXMoLi4sIFRSVUUpIGRv ZXNuJ3QgcmVtb3ZlIG5vbi1wYXRoIGNvbXBvbmVudHMuCisgICAgICAgIGJhc2VVUkwgPSBbYmFz ZVVSTCBfd2Via2l0X1VSTEJ5UmVtb3ZpbmdSZXNvdXJjZVNwZWNpZmllcl07CisgICAgCiAgICAg ICAgIGNvbnN0IFVJbnQ4ICpieXRlcyA9IFtkYXRhIGJ5dGVzXTsKICAgICAgICAgLy8gTk9URTog V2UgdXNlIFVURi04IGhlcmUgc2luY2UgdGhpcyBlbmNvZGluZyBpcyB1c2VkIHdoZW4gY29tcHV0 aW5nIHN0cmluZ3Mgd2hlbiByZXR1cm5pbmcgVVJMIGNvbXBvbmVudHMKICAgICAgICAgLy8gKGUu ZyBjYWxscyB0byBOU1VSTCAtcGF0aCkuIEhvd2V2ZXIsIHRoaXMgZnVuY3Rpb24gaXMgbm90IHRv bGVyYW50IG9mIGlsbGVnYWwgVVRGLTggc2VxdWVuY2VzLCB3aGljaApAQCAtNTM5LDkgKzU0Myw5 IEBAIHR5cGVkZWYgc3RydWN0IHsKIAogCiAKLS0gKE5TVVJMICopX3dlYmtpdF9VUkxCeVJlbW92 aW5nRnJhZ21lbnQKKy0gKE5TVVJMICopX3dlYmtpdF9VUkxCeVJlbW92aW5nQ29tcG9uZW50OihD RlVSTENvbXBvbmVudFR5cGUpY29tcG9uZW50CiB7Ci0gICAgQ0ZSYW5nZSBmcmFnUmcgPSBDRlVS TEdldEJ5dGVSYW5nZUZvckNvbXBvbmVudCgoQ0ZVUkxSZWYpc2VsZiwga0NGVVJMQ29tcG9uZW50 RnJhZ21lbnQsIE5VTEwpOworICAgIENGUmFuZ2UgZnJhZ1JnID0gQ0ZVUkxHZXRCeXRlUmFuZ2VG b3JDb21wb25lbnQoKENGVVJMUmVmKXNlbGYsIGNvbXBvbmVudCwgTlVMTCk7CiAgICAgLy8gQ2hl Y2sgdG8gc2VlIGlmIGEgZnJhZ21lbnQgZXhpc3RzIGJlZm9yZSBkZWNvbXBvc2luZyB0aGUgVVJM LgogICAgIGlmIChmcmFnUmcubG9jYXRpb24gPT0ga0NGTm90Rm91bmQpIHsKICAgICAgICAgcmV0 dXJuIHNlbGY7CkBAIC01NjUsNiArNTY5LDE2IEBAIHR5cGVkZWYgc3RydWN0IHsKICAgICByZXR1 cm4gcmVzdWx0ID8gW3Jlc3VsdCBhdXRvcmVsZWFzZV0gOiBzZWxmOwogfQogCistIChOU1VSTCAq KV93ZWJraXRfVVJMQnlSZW1vdmluZ0ZyYWdtZW50Cit7CisgICAgcmV0dXJuIFtzZWxmIF93ZWJr aXRfVVJMQnlSZW1vdmluZ0NvbXBvbmVudDprQ0ZVUkxDb21wb25lbnRGcmFnbWVudF07Cit9CisK Ky0gKE5TVVJMICopX3dlYmtpdF9VUkxCeVJlbW92aW5nUmVzb3VyY2VTcGVjaWZpZXIKK3sKKyAg ICByZXR1cm4gW3NlbGYgX3dlYmtpdF9VUkxCeVJlbW92aW5nQ29tcG9uZW50OmtDRlVSTENvbXBv bmVudFJlc291cmNlU3BlY2lmaWVyXTsKK30KKwogLSAoQk9PTClfd2Via2l0X2lzSmF2YVNjcmlw dFVSTAogewogICAgIHJldHVybiBbW3NlbGYgX3dlYl9vcmlnaW5hbERhdGFBc1N0cmluZ10gX3dl YmtpdF9pc0phdmFTY3JpcHRVUkxdOwpJbmRleDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTMyMTQpCisrKyBXZWJL aXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMCBAQAorMjAwNi0w My0wOCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQG55cG9wLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3RO ZXRzY2FwZVBsdWdJbi5zdWJwcm9qL1BsdWdpbk9iamVjdC5jOgorICAgICAgICAocGx1Z2luSW52 b2tlKTogQWRkZWQgYSBtZXRob2QgdG8gdGVzdCBnZXRVUkwuCisKIDIwMDYtMDMtMDggIE1hY2ll aiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmlj LgpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luLnN1 YnByb2ovUGx1Z2luT2JqZWN0LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luLnN1YnByb2ovUGx1Z2luT2JqZWN0LmMJKHJldmlzaW9u IDEzMjA5KQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0lu LnN1YnByb2ovUGx1Z2luT2JqZWN0LmMJKHdvcmtpbmcgY29weSkKQEAgLTcxLDExICs3MSwxMyBA QCBzdGF0aWMgY29uc3QgTlBVVEY4ICpwbHVnaW5Qcm9wZXJ0eUlkZW50CiB9OwogCiAjZGVmaW5l IElEX1RFU1RfQ0FMTEJBQ0tfTUVUSE9EICAgICAwCi0jZGVmaW5lIE5VTV9NRVRIT0RfSURFTlRJ RklFUlMgICAgICAxCisjZGVmaW5lIElEX1RFU1RfR0VUVVJMICAgICAgICAgICAgICAxCisjZGVm aW5lIE5VTV9NRVRIT0RfSURFTlRJRklFUlMgICAgICAyCiAKIHN0YXRpYyBOUElkZW50aWZpZXIg cGx1Z2luTWV0aG9kSWRlbnRpZmllcnNbTlVNX01FVEhPRF9JREVOVElGSUVSU107CiBzdGF0aWMg Y29uc3QgTlBVVEY4ICpwbHVnaW5NZXRob2RJZGVudGlmaWVyTmFtZXNbTlVNX01FVEhPRF9JREVO VElGSUVSU10gPSB7Ci0gICAgInRlc3RDYWxsYmFjayIKKyAgICAidGVzdENhbGxiYWNrIiwKKyAg ICAiZ2V0VVJMIgogfTsKIAogc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUlkZW50aWZpZXJzKCkKQEAg LTEzOCw4ICsxNDAsMjUgQEAgdm9pZCBwbHVnaW5JbnZva2UgKFBsdWdpbk9iamVjdCAqb2JqLCBO UAogICAgICAgICAgICAgTlBJZGVudGlmaWVyIGNhbGxiYWNrTWV0aG9kSUQgPSBicm93c2VyLT5n ZXRzdHJpbmdpZGVudGlmaWVyKGNhbGxiYWNrU3RyaW5nKTsKICAgICAgICAgICAgIGJyb3dzZXIt Pmludm9rZShvYmotPm5wcCwgd2luZG93U2NyaXB0T2JqZWN0LCBjYWxsYmFja01ldGhvZElELCAw LCAwLCAmYnJvd3NlclJlc3VsdCk7CiAgICAgICAgIH0KKyAgICB9IGVsc2UgaWYgKG5hbWUgPT0g cGx1Z2luTWV0aG9kSWRlbnRpZmllcnNbSURfVEVTVF9HRVRVUkxdKSB7CisgICAgICAgIGlmIChh cmdDb3VudCA9PSAyICYmIGFyZ3NbMF0udHlwZSA9PSBOUFZhcmlhbnRUeXBlX1N0cmluZyAmJiBh cmdzWzFdLnR5cGUgPT0gTlBWYXJpYW50VHlwZV9TdHJpbmcpIHsKKyAgICAgICAgICAgIE5QU3Ry aW5nIGFyZ1N0cmluZyA9IGFyZ3NbMF0udmFsdWUuc3RyaW5nVmFsdWU7CisgICAgICAgICAgICBp bnQgc2l6ZSA9IGFyZ1N0cmluZy5VVEY4TGVuZ3RoICsgMTsKKyAgICAgICAgICAgIE5QVVRGOCB1 cmxTdHJpbmdbc2l6ZV07CisgICAgICAgICAgICBzdHJuY3B5KHVybFN0cmluZywgYXJnU3RyaW5n LlVURjhDaGFyYWN0ZXJzLCBhcmdTdHJpbmcuVVRGOExlbmd0aCk7CisgICAgICAgICAgICB1cmxT dHJpbmdbc2l6ZSAtIDFdID0gJ1wwJzsKKworICAgICAgICAgICAgYXJnU3RyaW5nID0gYXJnc1sx XS52YWx1ZS5zdHJpbmdWYWx1ZTsKKyAgICAgICAgICAgIHNpemUgPSBhcmdTdHJpbmcuVVRGOExl bmd0aCArIDE7CisgICAgICAgICAgICBOUFVURjggdGFyZ2V0U3RyaW5nW3NpemVdOworICAgICAg ICAgICAgc3RybmNweSh0YXJnZXRTdHJpbmcsIGFyZ1N0cmluZy5VVEY4Q2hhcmFjdGVycywgYXJn U3RyaW5nLlVURjhMZW5ndGgpOworICAgICAgICAgICAgdGFyZ2V0U3RyaW5nW3NpemUgLSAxXSA9 ICdcMCc7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGJyb3dzZXItPmdldHVybChvYmotPm5w cCwgdXJsU3RyaW5nLCB0YXJnZXRTdHJpbmcpOworICAgICAgICB9CiAgICAgfQogCisKICAgICBy ZXN1bHQtPnR5cGUgPSBOUFZhcmlhbnRUeXBlX1ZvaWQ7CiB9CiAK