----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/120900/#review69507 -----------------------------------------------------------
Ship it! This looks fine for me. Please push it if you can push to the git repo. Let me know if I should do it! Thanks for your contribution. - Andreas Schneider On Oct. 29, 2014, 10:36 p.m., Raphael Kubo da Costa wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/120900/ > ----------------------------------------------------------- > > (Updated Oct. 29, 2014, 10:36 p.m.) > > > Review request for KDE Runtime and Andreas Schneider. > > > Bugs: 331674 > http://bugs.kde.org/show_bug.cgi?id=331674 > > > Repository: kde-runtime > > > Description > ------- > > libssh expects the values passed to the SSH_OPTIONS_TIMEOUT and > SSH_OPTIONS_TIMEOUT_USEC to be longs, not plain ints. > > On 64-bit platforms with sizeof(long) > sizeof(int), this mismatch can > be problematic and potentially result in invalid memory access that > causes the calls to ssh_options_set() to fail. > > > Diffs > ----- > > kioslave/sftp/kio_sftp.cpp 21cffac0e5892944ca6c5b74537ebc4b7fb4738e > > Diff: https://git.reviewboard.kde.org/r/120900/diff/ > > > Testing > ------- > > This is a bit hard to test, but with some tinkering in > `sftpProtocol::sftpOpenConnection()` I can get `ssh_options_set()` to read > parts of the argument passed to `sftpOpenConnection()` in addition to the > actual value passed to `ssh_options_set()` and make the ioslave always say > that it failed to set the timeout value. > > With this change, everything works as expected. > > > Thanks, > > Raphael Kubo da Costa > >