summaryrefslogtreecommitdiff
path: root/core/apps
authorerik <erik>2007-01-26 20:30:32 (UTC)
committer erik <erik>2007-01-26 20:30:32 (UTC)
commitf77da1ae08512b02a3c50a124f823ed77e53dd64 (patch) (side-by-side diff)
treeac7e414aff95348e0bf2fba3f45b2a06a4eb4623 /core/apps
parent4688f98202f590ec6af6c2e66a49dd2f80536083 (diff)
downloadopie-f77da1ae08512b02a3c50a124f823ed77e53dd64.zip
opie-f77da1ae08512b02a3c50a124f823ed77e53dd64.tar.gz
opie-f77da1ae08512b02a3c50a124f823ed77e53dd64.tar.bz2
Both packageslave.cpp and textedit.cpp have instances of possibly exploitable
race conditions associated to files. The big deal is that it is quite typical to use strings of pathnames to track files. But because that does not leverage the filesystem would be attackers may be able to exploit time lags in uses of filesystem functions (like stat and chmod or open) to get files with suspect data into the files that the applications are working with. This commit closes that potential hole even though there are no known exploits. Better safe then sorry. There is no change in the behavior of the apps.
Diffstat (limited to 'core/apps') (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/textedit/textedit.cpp45
1 files changed, 21 insertions, 24 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 4bbc62b..1c81a55 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -782,3 +782,3 @@ void TextEdit::showEditTools() {
bool TextEdit::save() {
- QString name, file;
+ QString name, file;
odebug << "saveAsFile " + currentFileName << oendl;
@@ -788,12 +788,11 @@ bool TextEdit::save() {
}
- name = currentFileName;
- if(doc) {
- file = doc->file();
- odebug << "saver file "+file << oendl;
- name = doc->name();
- odebug << "File named "+name << oendl;
- } else {
- file = currentFileName;
+ if(doc) {
+ file = doc->file();
+ odebug << "saver file "+file << oendl;
+ name = doc->name();
+ odebug << "File named "+name << oendl;
+ } else {
+ file = currentFileName;
name = QFileInfo(currentFileName).baseName();
- }
+ }
@@ -809,3 +808,4 @@ bool TextEdit::save() {
mode_t mode;
- stat(file.latin1(), &buf);
+ QFile f(file);
+ fstat(f.handle(), &buf);
mode = buf.st_mode;
@@ -816,3 +816,3 @@ bool TextEdit::save() {
if ( !fm.saveFile( *doc, rt ) ) {
- QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
+ QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
return false;
@@ -821,11 +821,9 @@ bool TextEdit::save() {
odebug << "regular save file" << oendl;
- QFile f(file);
- if( f.open(IO_WriteOnly)) {
- QCString crt = rt.utf8();
- f.writeBlock(crt,crt.length());
- } else {
- QMessageBox::message(tr("Text Edit"),tr("Write Failed"));
- return false;
- }
-
+ if( f.open(IO_WriteOnly)) {
+ QCString crt = rt.utf8();
+ f.writeBlock(crt,crt.length());
+ } else {
+ QMessageBox::message(tr("Text Edit"),tr("Write Failed"));
+ return false;
+ }
}
@@ -835,6 +833,5 @@ bool TextEdit::save() {
if(caption().left(1)=="*")
- setCaption(caption().right(caption().length()-1));
-
+ setCaption(caption().right(caption().length()-1));
- chmod( file.latin1(), mode);
+ fchmod( f.handle(), mode);
}