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
@@ -36,224 +36,241 @@ _;:,   .>  :=|.         This file is free software; you can
 #if QT_VERSION < 0x030000
 #include <qgfx_qws.h>
 #endif
 #include <qwindowsystem_qws.h>
 
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 
 #include <opie2/odevice.h>
 #include <opie2/oresource.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "passworddialogimpl.h"
 #include "loginwindowimpl.h"
 #include "loginapplication.h"
 #include "inputmethods.h"
 
 using namespace Opie::Core;
 
 
 LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose )
 {
 	QPopupMenu *pop = new QPopupMenu ( this );
 	pop-> insertItem ( tr( "Restart" ), this, SLOT( restart()));
 	pop-> insertItem ( tr( "Quit" ), this, SLOT( quit()));
 	m_menu-> setPopup ( pop );
 
 	QCopChannel *channel = new QCopChannel ( "QPE/TaskBar", this );
 	connect ( channel, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( receive(const QCString&,const QByteArray&)));
 
 	QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 );
 	m_input = new InputMethods ( m_taskbar );
  	connect ( m_input, SIGNAL( inputToggled(bool)), this, SLOT( calcMaxWindowRect()));
 	lay-> addWidget ( m_input );
 	lay-> addStretch ( 10 );
 
 	setActiveWindow ( );
 	m_password-> setFocus ( );
 
 	m_user-> insertStringList ( lApp-> allUsers ( ));
 
 	//there is no point in displaying the IM for a zaurus
 	if (ODevice::inst ( )-> series ( ) != Model_Zaurus){
 		QTimer::singleShot ( 0, this, SLOT( showIM()));
 	}
 
 	QString opiedir = ::getenv ( "OPIEDIR" );
 	QPixmap bgpix ( opiedir + "/pics/launcher/opie-background.jpg" );
 
 	if ( !bgpix. isNull ( )) {
 		setBackgroundPixmap ( bgpix );
 		m_caption-> setBackgroundPixmap ( bgpix);
 		TextLabel1-> setBackgroundPixmap ( bgpix);
 		TextLabel2-> setBackgroundPixmap ( bgpix);
 	}
 
 //	m_caption-> setText ( tr("<center>Welcome to OPIE %1</center><center>& %2 %3</center>"). arg(QPE_VERSION). arg ( ODevice::inst ( )-> systemString ( )). arg ( ODevice::inst ( )-> systemVersionString ( )));
 
 	Config cfg ( "opie-login" );
 	cfg. setGroup ( "General" );
 	QString last = cfg. readEntry ( "LastLogin" );
 
 	if ( !last. isEmpty ( ))
 		m_user-> setEditText ( last );
 
 	calcMaxWindowRect ( );
 
         if ( PasswordDialogImpl::needDialog() )
             QTimer::singleShot(10, this,  SLOT(showPasswordDialog()) );
 
 
 }
 
 LoginWindowImpl::~LoginWindowImpl ( )
 {
 }
 
 
 void LoginWindowImpl::receive ( const QCString &msg, const QByteArray &data )
 {
 	QDataStream stream ( data, IO_ReadOnly );
 
 	if ( msg == "hideInputMethod()" )
 		m_input-> hideInputMethod ( );
 	else if ( msg == "showInputMethod()" )
 		m_input-> showInputMethod ( );
 	else if ( msg == "reloadInputMethods()" )
 		m_input-> loadInputMethods ( );
 }
 
 void LoginWindowImpl::calcMaxWindowRect ( )
 {
 #ifdef Q_WS_QWS
 	QRect wr;
 	int displayWidth = qApp-> desktop ( )-> width ( );
 	QRect ir = m_input-> inputRect ( );
 	if ( ir.isValid() )
 		wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 );
 	else
 		wr.setCoords( 0, 0, displayWidth-1, m_taskbar->y()-1 );
 
 #if QT_VERSION < 0x030000
 	wr = qt_screen-> mapToDevice ( wr, QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
 #endif
 
 	QWSServer::setMaxWindowRect( wr );
 #endif
 }
 
 
 void LoginWindowImpl::keyPressEvent ( QKeyEvent *e )
 {
 	switch ( e-> key ( )) {
 		case HardKey_Suspend:   suspend ( );
 		                        break;
 		case HardKey_Backlight: backlight ( );
 		                        break;
 		default:                e-> ignore ( );
 		                        break;
 	}
 	LoginWindow::keyPressEvent ( e );
 }
 
 
 void LoginWindowImpl::toggleEchoMode ( bool t )
 {
 	m_password-> setEchoMode ( t ? QLineEdit::Normal : QLineEdit::Password );
 }
 
 void LoginWindowImpl::showIM ( )
 {
 	m_input-> showInputMethod ( );
 }
 
 void LoginWindowImpl::restart ( )
 {
 	qApp-> quit ( );
 }
 
 void LoginWindowImpl::quit ( )
 {
 	lApp-> quitToConsole ( );
 }
 
 void LoginWindowImpl::suspend ( )
 {
 	ODevice::inst ( )-> suspend ( );
 
 	QCopEnvelope e("QPE/System", "setBacklight(int)");
 	e << -3; // Force on
 }
 
 void LoginWindowImpl::backlight ( )
 {
 	QCopEnvelope e("QPE/System", "setBacklight(int)");
 	e << -2; // toggle
 }
 
 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
@@ -130,286 +130,287 @@ Bkmk& Bkmk::operator=(const Bkmk& rhs)
     else
 	m_anno = NULL;
     m_position = rhs.m_position;
     m_position2 = rhs.m_position2;
     m_red = rhs.m_red;
     m_green = rhs.m_green;
     m_blue = rhs.m_blue;
     m_level = rhs.m_level;
     return *this;
 }
 
 bool Bkmk::operator==(const Bkmk& rhs)
 {
     return ((m_position == rhs.m_position) && (m_position2 == rhs.m_position2) && (rhs.m_namelen == m_namelen) && memcmp(m_name,rhs.m_name,m_namelen) == 0);
 }
 
 void Bkmk::setAnno(unsigned char* t, unsigned short len)
 {
     if (m_anno != NULL)
     {
 	delete [] m_anno;
 	m_anno = NULL;
     }
     if (t != NULL)
     {
 	m_annolen = len;
 	m_anno = new unsigned char[m_annolen];
 	memcpy(m_anno, t, m_annolen);
     }
     else
     {
 	m_annolen = sizeof(tchar);
 	m_anno = new unsigned char[m_annolen];
 	*((tchar*)m_anno) = 0;
     }
 }
 
 void Bkmk::setAnno(tchar* t)
 {
     if (m_anno != NULL)
     {
 	delete [] m_anno;
 	m_anno = NULL;
     }
     if (t != NULL)
     {
 	unsigned short len = ustrlen(t)+1;
 	m_annolen = sizeof(tchar)*len;
 	m_anno = new unsigned char[m_annolen];
 	memcpy(m_anno, t, m_annolen);
     }
     else
     {
 	m_annolen = sizeof(tchar);
 	m_anno = new unsigned char[m_annolen];
 	*((tchar*)m_anno) = 0;
     }
 }
 
 BkmkFile::BkmkFile(const char *fnm, bool w, bool _x)
   :
   wt(w), isUpgraded(false), m_extras(_x)
 {
     if (w)
     {
 	f = fopen(fnm, "wb");
     }
     else
     {
 	f = fopen(fnm, "rb");
     }
 }
 
 BkmkFile::~BkmkFile()
 {
     if (f != NULL) fclose(f);
 }
 
 void BkmkFile::write(const Bkmk& b)
 {
     if (f != NULL)
     {
 	fwrite(&b.m_namelen, sizeof(b.m_namelen),1,f);
 	fwrite(b.m_name,1,b.m_namelen,f);
 	fwrite(&b.m_annolen, sizeof(b.m_annolen),1,f);
 	fwrite(b.m_anno,1,b.m_annolen,f);
 	fwrite(&b.m_position,sizeof(b.m_position),1,f);
 	if (m_extras)
 	  {
 	    fwrite(&b.m_position2,sizeof(b.m_position2),1,f);
 	    fwrite(&b.m_red,sizeof(b.m_red),1,f);
 	    fwrite(&b.m_green,sizeof(b.m_green),1,f);
 	    fwrite(&b.m_blue,sizeof(b.m_blue),1,f);
 	    fwrite(&b.m_level,sizeof(b.m_level),1,f);
 	  }
     }
 }
 
 void BkmkFile::write(CList<Bkmk>& bl)
 {
     if (f != NULL)
     {
 	fwrite(&magic, sizeof(magic), 1, f);
 	for (CList<Bkmk>::iterator i = bl.begin(); i != bl.end(); i++)
 	{
 	    write(*i);
 	}
     }
 }
 
 CList<Bkmk>* BkmkFile::readall()
 {
     CList<Bkmk>* bl = NULL;
     if (f != NULL)
     {
 	unsigned long newmagic;
 	fread(&newmagic, sizeof(newmagic), 1, f);
 	if ((newmagic & 0xffffff00) != (magic & 0xffffff00))
 	{
 	    if (QMessageBox::warning(NULL, "Old bookmark file!", "Which version of " PROGNAME "\ndid you upgrade from?", "0_4*", "Any other version") == 0)
 	    {
 		fseek(f,0,SEEK_SET);
 		bl = readall00(&read05);
 	    }
 	    else
 	    {
 		fseek(f,0,SEEK_SET);
 		bl = readall00(&read03);
 	    }
 	    isUpgraded = true;
 	}
 	else
 	{
 	    switch(newmagic & 0xff)
 	    {
 		case 7:
 		    isUpgraded = false;
 		    bl = readall00(read07);
 //		    qDebug("Correct version!");
 		    break;
 		case 6:
 		    isUpgraded = true;
 		    bl = readall00(read06);
 //		    qDebug("Correct version!");
 		    break;
 		case 5:
 		    isUpgraded = true;
 		    bl = readall00(read05);
 //		    qDebug("Known version!");
 		    break;
 		default:
 //		    qDebug("Unknown version!");
 		    isUpgraded = true;
 		    bl = readall00(read05);
 	    }
 	}
     }
     return bl;
 }
 
 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)
     {
 	unsigned short ln;
 	if (fread(&ln,sizeof(ln),1,f) == 1)
 	{
 	    b = new Bkmk;
 	    b->m_namelen = ln;
 	    b->m_name = new unsigned char[b->m_namelen];
 	    fread(b->m_name,1,b->m_namelen,f);
 
 	    fread(&(b->m_annolen),sizeof(b->m_annolen),1,f);
 	    if (b->m_annolen > 0)
 	    {
 		b->m_anno = new unsigned char[b->m_annolen];
 		fread(b->m_anno,1,b->m_annolen,f);
 	    }
 	    fread(&(b->m_position),sizeof(b->m_position),1,f);
 	    b->m_position2 = b->m_position+b->m_namelen-1;
 	    b->m_red = b->m_green = b->m_blue = 127;
 	    b->m_level = 0;
 	}
     }
     return b;
 }
 
 Bkmk* BkmkFile::read07(BkmkFile* _this, FILE* f)
 {
   Bkmk* b = NULL;
   if (f != NULL)
     {
       unsigned short ln;
       if (fread(&ln,sizeof(ln),1,f) == 1)
 	{
 	  b = new Bkmk;
 	  b->m_namelen = ln;
 	  b->m_name = new unsigned char[b->m_namelen];
 	  fread(b->m_name,1,b->m_namelen,f);
 	  
 	  fread(&(b->m_annolen),sizeof(b->m_annolen),1,f);
 	  if (b->m_annolen > 0)
 	    {
 	      b->m_anno = new unsigned char[b->m_annolen];
 	      fread(b->m_anno,1,b->m_annolen,f);
 	    }
 	  fread(&(b->m_position),sizeof(b->m_position),1,f);
 	  if (_this->m_extras)
 	    {
 	      fread(&(b->m_position2),sizeof(b->m_position2),1,f);
 	      fread(&(b->m_red),sizeof(b->m_red),1,f);
 	      fread(&(b->m_green),sizeof(b->m_green),1,f);
 	      fread(&(b->m_blue),sizeof(b->m_blue),1,f);
 	      fread(&(b->m_level),sizeof(b->m_level),1,f);
 	    }
 	  else
 	    {
 	      b->m_position2 = b->m_position;
 	      b->m_red = b->m_green = b->m_blue = 255;
 	      b->m_level = 0;
 	    }
 	}
     }
   return b;
 }