Skip to content

Commit

Permalink
Merge branch 'main' into far3-dev-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
michaellukashov committed Feb 26, 2024
2 parents 9c69e20 + fe6e043 commit 1e83c23
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
<!-- next-header -->
## [Unreleased] - ReleaseDate

## [24.2.3.596] - 2024-02-26

### Fixes

* gh-414 FTP: Netbox always crashes while connecting


## [24.2.2.595] - 2024-02-25

### Fixes
Expand Down
4 changes: 2 additions & 2 deletions src/NetBox/NetBox.rc
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ FILETYPE 0x2
{
VALUE "CompanyName", "Mikhail Lukashov\0"
VALUE "FileDescription", "NetBox: SFTP/FTP/FTPS/SCP/WebDAV/S3 client for Far Manager 3.0\0"
VALUE "FileVersion", "24.2.2.595\0"
VALUE "FileVersion", "24.2.3.596\0"
VALUE "InternalName", "FarNetBox\0"
VALUE "LegalCopyright", "(c) 2011, 2024 Mikhail Lukashov\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "NetBox.dll\0"
VALUE "ProductName", "NetBox\0"
VALUE "ProductVersion", "24.2.2.595\0"
VALUE "ProductVersion", "24.2.3.596\0"
VALUE "ReleaseType", "beta\0"
VALUE "WWW", "https://github.com/michaellukashov/Far-NetBox\0"
}
Expand Down
4 changes: 2 additions & 2 deletions src/NetBox/plugin_version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

#define NETBOX_VERSION_MAJOR 24
#define NETBOX_VERSION_MINOR 2
#define NETBOX_VERSION_PATCH 2
#define NETBOX_VERSION_BUILD 595
#define NETBOX_VERSION_PATCH 3
#define NETBOX_VERSION_BUILD 596
2 changes: 0 additions & 2 deletions src/core/FtpFileSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4481,8 +4481,6 @@ bool TFTPFileSystem::HandleAsyncRequestNeedPass(
}
}

free(Data.Password);
Data.Password = nullptr;
// When returning REPLY_OK, we need to return an allocated password,
// even if we were returning and empty string we got on input.
if (RequestResult == TFileZillaIntf::REPLY_OK)
Expand Down

0 comments on commit 1e83c23

Please sign in to comment.