diff options
| author | mread <qt-info@nokia.com> | 2009-09-09 08:51:42 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-09-09 10:25:04 (GMT) |
| commit | 930a04cd66e40addd42e3ade195400c959fd3292 (patch) | |
| tree | 28e9995c0dffa54a1f153f09718220aba279f03a /src/gui/text | |
| parent | 94bdab6ac2b47f4e4301dff83f43e1b68d587a61 (diff) | |
| download | Qt-930a04cd66e40addd42e3ade195400c959fd3292.zip Qt-930a04cd66e40addd42e3ade195400c959fd3292.tar.gz Qt-930a04cd66e40addd42e3ade195400c959fd3292.tar.bz2 | |
Getting text widget OOM tests working in Symbian
There is one actual bug fix, checking for null pointer return.
The exception safety test code now initialises the fonts system.
The S60 fonts system does not survive OOM testing
without this.
Otherwise some duplicate tests are removed and code tidied up.
Reviewed-by: Liang Qi
Reviewed-by: Harald Fernengel
Reviewed-by: Alessandro Portale
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp index 7cae784..ab2506c 100644 --- a/src/gui/text/qfontengine_s60.cpp +++ b/src/gui/text/qfontengine_s60.cpp @@ -74,7 +74,7 @@ QByteArray QFontEngineS60Extensions::getSfntTable(uint tag) const Q_ASSERT(m_trueTypeExtension->HasTrueTypeTable(tag)); TInt error = KErrNone; TInt tableByteLength = 0; - TAny *table = m_trueTypeExtension->GetTrueTypeTable(error, tag, &tableByteLength); + TAny *table = q_check_ptr(m_trueTypeExtension->GetTrueTypeTable(error, tag, &tableByteLength)); QByteArray result(static_cast<const char*>(table), tableByteLength); m_trueTypeExtension->ReleaseTrueTypeTable(table); return result; |