core/opie-login/loginwindowimpl.cpp has a fix to properly free strings

that were dup'ed.

noncore/apps/opie-reader/Bkmks.cpp deletes a temporary pointer that
was not being properly disposed of.

2 files changed, 22 insertions, 4 deletions

diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index 547a9b3..b9a286d 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -196,64 +196,81 @@ void LoginWindowImpl::backlight ( )
 class WaitLogo : public QLabel {
 public:
 	WaitLogo ( ) : QLabel ( 0, "wait hack!", WStyle_Customize | WStyle_NoBorder | WStyle_Tool )
 	{
 		setPixmap( Opie::Core::OResource::loadPixmap( "launcher/new_wait" ) );
 		setAlignment ( AlignCenter );
 		move ( 0, 0 );
 		resize ( qApp-> desktop ( )-> width ( ), qApp-> desktop ( )-> height ( ));
 
 		m_visible = false;
 		show ( );
 	}
 
 	virtual void showEvent ( QShowEvent *e )
 	{
 		QLabel::showEvent ( e );
 		m_visible = true;
 	}
 
 	virtual void paintEvent ( QPaintEvent *e )
 	{
 		QLabel::paintEvent ( e );
 		if ( m_visible )
 			qApp-> quit ( );
 	}
 
 private:
 	bool m_visible;
 };
 
 void LoginWindowImpl::login ( )
 {
-	const char *user = ::strdup ( m_user-> currentText ( ). local8Bit ( ));
-	const char *pass = ::strdup ( m_password-> text ( ). local8Bit ( ));
+	char *const user = ::strdup ( m_user-> currentText ( ). local8Bit ( ));
+	char *pass = ::strdup ( m_password-> text ( ). local8Bit ( ));
 
-	if ( !user || !user [0] )
+	if ( !user ) {
+		if ( pass )
+			free( pass );
 		return;
-	if ( !pass )
+	}
+	if ( !user [0] ) {
+		free( user );
+		if ( pass )
+			free( pass );
+		return;
+	}
+	bool passwordIsEmpty = false;
+	if ( !pass ) {
+		passwordIsEmpty = true;
 		pass = "";
+	}
 
 	if ( lApp-> checkPassword ( user, pass )) {
+		if ( !passwordIsEmpty )
+			free(pass);
 		Config cfg ( "opie-login" );
 		cfg. setGroup ( "General" );
 		cfg. writeEntry ( "LastLogin", user );
 		cfg. write ( );
 
 		lApp-> setLoginAs ( user );
 
 		// Draw a big wait icon, the image can be altered in later revisions
 		m_input-> hideInputMethod ( );
 		new WaitLogo ( );
 		// WaitLogo::showEvent() calls qApp-> quit()
 	}
 	else {
 		QMessageBox::warning ( this, tr( "Wrong password" ), tr( "The given password is incorrect." ));
 		m_password-> clear ( );
+		free( user );
+		if ( !passwordIsEmpty )
+		    free( pass );
 	}
 }
 
 void LoginWindowImpl::showPasswordDialog() {
     PasswordDialogImpl dia( this );
     dia.showMaximized();
     dia.exec();
 }
diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp
index 28f6318..00141a3 100644
--- a/noncore/apps/opie-reader/Bkmks.cpp
+++ b/noncore/apps/opie-reader/Bkmks.cpp
@@ -290,64 +290,65 @@ CList<Bkmk>* BkmkFile::readall()
 CList<Bkmk>* BkmkFile::readall00(Bkmk* (*readfn)(BkmkFile*, FILE*))
 {
     CList<Bkmk>* bl = new CList<Bkmk>;
     while (1)
     {
 	Bkmk* b = (*readfn)(this, f);
 	if (b == NULL) break;
 	bl->push_back(*b);
 	delete b;
     }
     return bl;
 }
 
 Bkmk* BkmkFile::read03(BkmkFile* /*_this*/, FILE* f)
 {
     Bkmk* b = NULL;
     if (f != NULL)
     {
 	unsigned short ln;
 	if (fread(&ln,sizeof(ln),1,f) == 1)
 	{
 	    tchar* name = new tchar[ln+1];
 	    fread(name,sizeof(tchar),ln,f);
 	    name[ln] = 0;
 
 	    ln = 0;
 	    tchar* anno = new tchar[ln+1];
 	    anno[ln] = 0;
 
 	    unsigned int pos;
 	    fread(&pos,sizeof(pos),1,f);
 	    b = new Bkmk(name,anno,pos);
+	    delete [] anno;
 	}
     }
     return b;
 }
 
 Bkmk* BkmkFile::read05(BkmkFile* /*_this*/, FILE* f)
 {
     Bkmk* b = NULL;
     if (f != NULL)
     {
 	unsigned short ln;
 	if (fread(&ln,sizeof(ln),1,f) == 1)
 	{
 	    tchar* nm = new tchar[ln+1];
 	    fread(nm,sizeof(tchar),ln,f);
 	    nm[ln] = 0;
 	    fread(&ln,sizeof(ln),1,f);
 	    tchar* anno = new tchar[ln+1];
 	    if (ln > 0) fread(anno,sizeof(tchar),ln,f);
 	    anno[ln] = 0;
 	    unsigned int pos;
 	    fread(&pos,sizeof(pos),1,f);
 	    b = new Bkmk(nm,anno,pos);
 	}
     }
     return b;
 }
 
 Bkmk* BkmkFile::read06(BkmkFile* /*_this*/, FILE* f)
 {
     Bkmk* b = NULL;
     if (f != NULL)