From 53d630c9c4813142ee13e6843c30476a5db26e78 Mon Sep 17 00:00:00 2001
From: erik <erik>
Date: Fri, 26 Jan 2007 20:22:50 +0000
Subject: Each file in this commit exhibit an example of what prevent calls

'reverse inull'. All that means is that a pointer gets dereferenced. Then
a pointer gets checked for validity before being dereferenced again. This
almost always points to shenanigans.

For example, the konsole.cpp file has this konsoleInit() call which passes
in a const char** shell variable. Since it is a double pointer the programmer
who wrote the code made the mistake of mixing the checking of the pointer
and the pointer that points to the pointer. This commit attempts to correct
that.

Of course there are other instances of the same thing. But they all boil
down to a small mistake which might have produced strange side effects.
---
(limited to 'core')

diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index f4ca0bf..5c40569 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -217,10 +217,16 @@ static void konsoleInit(const char** shell) {
     QPEApplication::grabKeyboard(); // for CTRL and ALT
 #endif
 
+    if (!shell) {
+        owarn << "No double pointer 'shell'" << oendl;
+	return;
+    }
+
     *shell = getenv("SHELL");
-    owarn << "SHell initially is " << *shell << "" << oendl;
+    if (*shell)
+        owarn << "Current shell: " << *shell << "" << oendl;
 
-    if (shell == NULL || *shell == '\0') {
+    if (*shell == NULL || **shell == '\0') {
         struct passwd *ent = 0;
         uid_t me = getuid();
         *shell = "/bin/sh";
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 61beac5..4bbc62b 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -850,46 +850,32 @@ bool TextEdit::saveAs() {
     if(caption() == tr("Text Editor"))
         return false;
     odebug << "saveAsFile " + currentFileName << oendl;
-      // case of nothing to save...
-//     if ( !doc && !currentFileName.isEmpty()) {
-// //|| !bFromDocView)
-//         odebug << "no doc" << oendl;
-//         return true;
-//     }
-//     if ( !editor->edited() ) {
-//         delete doc;
-//         doc = 0;
-//         return true;
-//     }
 
     QString rt = editor->text();
     odebug << currentFileName << oendl;
 
     if( currentFileName.isEmpty()
         || currentFileName == tr("Unnamed")
-        || currentFileName == tr("Text Editor")) {
+        || currentFileName == tr("Text Editor"))
+    {
         odebug << "do silly TT filename thing" << oendl;
-//        if ( doc && doc->name().isEmpty() ) {
         QString pt = rt.simplifyWhiteSpace();
         int i = pt.find( ' ' );
         QString docname = pt;
-        if ( i > 0 )
-            docname = pt.left( i );
-          // remove "." at the beginning
+        if ( i > 0 ) docname = pt.left( i );
+
         while( docname.startsWith( "." ) )
             docname = docname.mid( 1 );
         docname.replace( QRegExp("/"), "_" );
-          // cut the length. filenames longer than that
-          //don't make sense and something goes wrong when they get too long.
-        if ( docname.length() > 40 )
-            docname = docname.left(40);
-        if ( docname.isEmpty() )
-            docname = tr("Unnamed");
+        // Cut the length. Filenames longer than 40 are not helpful
+        // and something goes wrong when they get too long.
+        if ( docname.length() > 40 ) docname = docname.left(40);
+
+        if ( docname.isEmpty() ) docname = tr("Unnamed");
+
         if(doc) doc->setName(docname);
+
         currentFileName=docname;
-//         }
-//         else
-//             odebug << "hmmmmmm" << oendl;
     }
 
 
@@ -906,12 +892,11 @@ bool TextEdit::saveAs() {
     QString dire = cuFi.dirPath();
     if(dire==".")
         dire = QPEApplication::documentDir();
+
     QString str;
     if( !featureAutoSave) {
-				str = OFileDialog::getSaveFileName( 2,
-																						dire,
-																						filee, map);
-		} else
+        str = OFileDialog::getSaveFileName( 2, dire, filee, map);
+    } else
         str = currentFileName;
 
     if(!str.isEmpty()) {
@@ -921,35 +906,30 @@ bool TextEdit::saveAs() {
         QFileInfo fi(fileNm);
         currentFileName=fi.fileName();
         if(doc)
-//        QString file = doc->file();
-//        doc->removeFiles();
             delete doc;
-				DocLnk nf;
-				nf.setType("text/plain");
-				nf.setFile( fileNm);
-				doc = new DocLnk(nf);
-//        editor->setText(rt);
-				odebug << "Saving file as "+currentFileName << oendl;
-				doc->setName( fi.baseName() /*currentFileName*/);
-				updateCaption( currentFileName);
-
-				FileManager fm;
-				if ( !fm.saveFile( *doc, rt ) ) {
-						QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
-						return false;
-				}
-
-				if( filePerms ) {
-						filePermissions *filePerm;
-						filePerm = new filePermissions(this,
-																					 tr("Permissions"),true,
-																					 0,(const QString &)fileNm);
-						QPEApplication::execDialog( filePerm );
-
-						if( filePerm)
-								delete  filePerm;
-				}
-//        }
+
+        DocLnk nf;
+        nf.setType("text/plain");
+        nf.setFile( fileNm);
+        doc = new DocLnk(nf);
+        odebug << "Saving file as "+currentFileName << oendl;
+        doc->setName( fi.baseName() );
+        updateCaption( currentFileName);
+
+        FileManager fm;
+        if ( !fm.saveFile( *doc, rt ) ) {
+            QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
+            return false;
+        }
+
+        if( filePerms ) {
+            filePermissions *filePerm;
+            filePerm = new filePermissions(this, tr("Permissions"),true, 0,
+                                           (const QString &)fileNm);
+            QPEApplication::execDialog( filePerm );
+
+            delete  filePerm;
+        }
         editor->setEdited( false);
         edited1 = false;
         edited = false;
@@ -1197,10 +1177,8 @@ void TextEdit::doGoto() {
    QString number = gotoEdit->text();
    gotoEdit->hide();
 
-   if(gotoEdit) {
-      delete gotoEdit;
-      gotoEdit = 0;
-   }
+   delete gotoEdit;
+   gotoEdit = 0;
 
    bool ok;
    int lineNumber = number.toInt(&ok, 10);
--
cgit v0.9.0.2