Every single file in this commit had a memory leak where a resource is

allocated in the constructor but not de-allocated in the destructor.

This commit fixes that.

1 files changed, 2 insertions, 3 deletions

diff --git a/noncore/apps/opie-write/qrichtext.cpp b/noncore/apps/opie-write/qrichtext.cpp
index c27eb1e..f040f1e 100644
--- a/noncore/apps/opie-write/qrichtext.cpp
+++ b/noncore/apps/opie-write/qrichtext.cpp
@@ -6015,197 +6015,196 @@ QTextFormat QTextFormat::makeTextFormat( const QStyleSheetItem *style, const QMa
                 format.setPointSize( int( scaleFontsFactor * style.mid( 10, style.length() - 12 ).toInt() ) );
             } if ( style.startsWith("font-style:" ) ) {
                 QString s = style.mid( 11 ).stripWhiteSpace();
                 if ( s == "normal" )
                     format.fn.setItalic( FALSE );
                 else if ( s == "italic" || s == "oblique" )
                     format.fn.setItalic( TRUE );
             } else if ( style.startsWith("font-weight:" ) ) {
                 QString s = style.mid( 12 );
                 bool ok = TRUE;
                 int n = s.toInt( &ok );
                 if ( ok )
                     format.fn.setWeight( n/8 );
             } else if ( style.startsWith("font-family:" ) ) {
                 format.fn.setFamily( QTextDocument::section(style.mid(12),",",0,0).stripWhiteSpace() );
             } else if ( style.startsWith("text-decoration:" ) ) {
                 QString s = style.mid( 16 ).stripWhiteSpace();
                 format.fn.setUnderline( s == "underline" );
             } else if ( style.startsWith("vertical-align:" ) ) {
                 QString s = style.mid( 15 ).stripWhiteSpace();
                 if ( s == "sub" )
                     format.setVAlign( QTextFormat::AlignSubScript );
                 else if ( s == "super" )
                     format.setVAlign( QTextFormat::AlignSuperScript );
                 else
                     format.setVAlign( QTextFormat::AlignNormal );
             } else if ( style.startsWith("color:" ) ) {
                 format.col.setNamedColor( style.mid(6) );
                 format.linkColor = FALSE;
             }
         }
     }
 
     format.update();
     return format;
 }
 
 struct QPixmapInt
 {
     QPixmapInt() : ref( 0 ) {}
     QPixmap pm;
             int    ref;
 };
 
 static QMap<QString, QPixmapInt> *pixmap_map = 0;
 
 QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, const QString& context,
                         QMimeSourceFactory &factory )
-    : QTextCustomItem( p )
+    : QTextCustomItem( p ), reg( 0 )
 {
     width = height = 0;
     if ( attr.contains("width") )
         width = attr["width"].toInt();
     if ( attr.contains("height") )
         height = attr["height"].toInt();
 
-    reg = 0;
     QString imageName = attr["src"];
 
     if (!imageName)
         imageName = attr["source"];
 
     if ( !imageName.isEmpty() ) {
         imgId = QString( "%1,%2,%3,%4" ).arg( imageName ).arg( width ).arg( height ).arg( (ulong)&factory );
         if ( !pixmap_map )
             pixmap_map = new QMap<QString, QPixmapInt>;
         if ( pixmap_map->contains( imgId ) ) {
             QPixmapInt& pmi = pixmap_map->operator[](imgId);
             pm = pmi.pm;
             pmi.ref++;
             width = pm.width();
             height = pm.height();
         } else {
             QImage img;
             const QMimeSource* m =
                 factory.data( imageName, context );
             if ( !m ) {
                 owarn << "QTextImage: no mimesource for " << imageName.latin1() << "" << oendl; 
             }
             else {
                 if ( !QImageDrag::decode( m, img ) ) {
                     owarn << "QTextImage: cannot decode " << imageName.latin1() << "" << oendl; 
                 }
             }
 
             if ( !img.isNull() ) {
                 if ( width == 0 ) {
                     width = img.width();
                     if ( height != 0 ) {
                         width = img.width() * height / img.height();
                     }
                 }
                 if ( height == 0 ) {
                     height = img.height();
                     if ( width != img.width() ) {
                         height = img.height() * width / img.width();
                     }
                 }
                 if ( img.width() != width || img.height() != height ){
 #ifndef QT_NO_IMAGE_SMOOTHSCALE
                     img = img.smoothScale(width, height);
 #endif
                     width = img.width();
                     height = img.height();
                 }
                 pm.convertFromImage( img );
             }
             if ( !pm.isNull() ) {
                 QPixmapInt& pmi = pixmap_map->operator[](imgId);
                 pmi.pm = pm;
                 pmi.ref++;
             }
         }
         if ( pm.mask() ) {
             QRegion mask( *pm.mask() );
             QRegion all( 0, 0, pm.width(), pm.height() );
             reg = new QRegion( all.subtract( mask ) );
         }
     }
 
     if ( pm.isNull() && (width*height)==0 )
         width = height = 50;
 
     place = PlaceInline;
     if ( attr["align"] == "left" )
         place = PlaceLeft;
     else if ( attr["align"] == "right" )
         place = PlaceRight;
 
     tmpwidth = width;
     tmpheight = height;
 
     attributes = attr;
 }
 
 QTextImage::~QTextImage()
 {
+    delete reg;
     if ( pixmap_map && pixmap_map->contains( imgId ) ) {
         QPixmapInt& pmi = pixmap_map->operator[](imgId);
         pmi.ref--;
         if ( !pmi.ref ) {
             pixmap_map->remove( imgId );
             if ( pixmap_map->isEmpty() ) {
                 delete pixmap_map;
                 pixmap_map = 0;
             }
         }
     }
-    delete reg;
 }
 
 QString QTextImage::richText() const
 {
     QString s;
     s += "<img ";
     QMap<QString, QString>::ConstIterator it = attributes.begin();
     for ( ; it != attributes.end(); ++it )
         s += it.key() + "=" + *it + " ";
     s += ">";
     return s;
 }
 
 void QTextImage::adjustToPainter( QPainter* p )
 {
     width = scale( tmpwidth, p );
     height = scale( tmpheight, p );
 }
 
 #if !defined(Q_WS_X11)
 #include <qbitmap.h>
 #include "qcleanuphandler.h"
 static QPixmap *qrt_selection = 0;
 static QSingleCleanupHandler<QPixmap> qrt_cleanup_pixmap;
 static void qrt_createSelectionPixmap( const QColorGroup &cg )
 {
     qrt_selection = new QPixmap( 2, 2 );
     qrt_cleanup_pixmap.set( &qrt_selection );
     qrt_selection->fill( Qt::color0 );
     QBitmap m( 2, 2 );
     m.fill( Qt::color1 );
     QPainter p( &m );
     p.setPen( Qt::color0 );
     for ( int j = 0; j < 2; ++j ) {
         p.drawPoint( j % 2, j );
     }
     p.end();
     qrt_selection->setMask( m );
     qrt_selection->fill( cg.highlight() );
 }
 #endif
 
 void QTextImage::draw( QPainter* p, int x, int y, int cx, int cy, int cw, int ch, const QColorGroup& cg, bool selected )
 {
     if ( placement() != PlaceInline ) {
         x = xpos;
         y = ypos;
     }