diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 19:32:02 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 19:32:02 +0000 |
| commit | bd6a4e1afbc4005778b9de508dc179cd7b7006d3 (patch) | |
| tree | 036eed73d8d4f71effe19cfc4a0d4693b142637b /net/ftp | |
| parent | 5e37c45f06e1a574b08588c6679c977eb4f8ee47 (diff) | |
| download | chromium_src-bd6a4e1afbc4005778b9de508dc179cd7b7006d3.zip chromium_src-bd6a4e1afbc4005778b9de508dc179cd7b7006d3.tar.gz chromium_src-bd6a4e1afbc4005778b9de508dc179cd7b7006d3.tar.bz2 | |
FTP: fix navigation to ftp://ftp.emea.ibm.com/toibm/tivoli
Recognize a slightly different format of a "Permission denied" error.
BUG=95443
TEST=Navigate to ftp://ftp.emea.ibm.com/toibm/tivoli; no error message should appear.
Review URL: http://codereview.chromium.org/7795024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp')
| -rw-r--r-- | net/ftp/ftp_directory_listing_parser_ls.cc | 2 | ||||
| -rw-r--r-- | net/ftp/ftp_directory_listing_parser_ls_unittest.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/ftp/ftp_directory_listing_parser_ls.cc b/net/ftp/ftp_directory_listing_parser_ls.cc index 9098583..ec99700 100644 --- a/net/ftp/ftp_directory_listing_parser_ls.cc +++ b/net/ftp/ftp_directory_listing_parser_ls.cc @@ -63,7 +63,7 @@ bool LooksLikePermissionDeniedError(const string16& text) { if (parts.size() != 3) return false; - return parts[2] == ASCIIToUTF16("Permission denied"); + return parts[2].find(ASCIIToUTF16("Permission denied")) != string16::npos; } // Returns the column index of the end of the date listing and detected diff --git a/net/ftp/ftp_directory_listing_parser_ls_unittest.cc b/net/ftp/ftp_directory_listing_parser_ls_unittest.cc index b00a69a..4779a3c 100644 --- a/net/ftp/ftp_directory_listing_parser_ls_unittest.cc +++ b/net/ftp/ftp_directory_listing_parser_ls_unittest.cc @@ -133,6 +133,7 @@ TEST_F(FtpDirectoryListingParserLsTest, Ignored) { "ftpd: .: Permission denied", "ftpd-BSD: .: Permission denied", + "ls: .: EDC5111I Permission denied.", // Tests important for security: verify that after we detect the column // offset we don't try to access invalid memory on malformed input. |