diff options
| author | Michele Calgaro <[email protected]> | 2018-11-28 23:51:20 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-11-28 23:51:20 +0900 |
| commit | 6db0c5f228d12fc1a1ef861717d1dc4a3c9d6a6c (patch) | |
| tree | 972d106294d740e92c586300da66d011bfe9d13e /kdesktop | |
| parent | 6ae10fc66ed3c35e98e49bac8bf6670f0a9e2d6b (diff) | |
| download | tdebase-6db0c5f228d12fc1a1ef861717d1dc4a3c9d6a6c.tar.gz tdebase-6db0c5f228d12fc1a1ef861717d1dc4a3c9d6a6c.zip | |
Improved previous commit using local8Bit() in place of utf8() when a
password is transmitted over pipes to other processes.
Signed-off-by: Michele Calgaro <[email protected]>
Signed-off-by: Slávek Banko <[email protected]>
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 4 | ||||
| -rw-r--r-- | kdesktop/minicli.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index b34c5b494..fdde3fc9e 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -2807,8 +2807,8 @@ void LockProcess::processInputPipeCommand(TQString inputcommand) { pin_entry = qryDlg.getEntry(); mInfoMessageDisplayed=false; if (mPipeOpen_out == true) { - TQCString pin_entry_utf8 = pin_entry.utf8(); // utf8 length may differ from TQString length - if (write(mPipe_fd_out, pin_entry_utf8.data(), pin_entry_utf8.length()+1) == -1) { + TQCString pin_entry_local8 = pin_entry.local8Bit(); // local 8 bit length may differ from TQString length + if (write(mPipe_fd_out, pin_entry_local8.data(), pin_entry_local8.length()+1) == -1) { // Error handler to shut up gcc warnings } if (write(mPipe_fd_out, "\n\r", 3) == -1) { diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 9fb4a283c..4b8d390b3 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -483,7 +483,7 @@ int Minicli::runCommand() proc_checkpwd.setScheduler(m_iScheduler); } - if (proc_checkpwd.checkInstall(m_dlg->lePassword->password().utf8()) != 0) + if (proc_checkpwd.checkInstall(m_dlg->lePassword->password().local8Bit()) != 0) { KMessageBox::sorry(this, i18n("Incorrect password; please try again.")); return 1; @@ -534,7 +534,7 @@ int Minicli::runCommand() sigprocmask(SIG_BLOCK, &sset, 0L); proc.setTerminal(true); proc.setErase(true); - _exit(proc.exec(m_dlg->lePassword->password().utf8())); + _exit(proc.exec(m_dlg->lePassword->password().local8Bit())); return 0; } else |