diff -r f2f7b3284356 -r 91ef7621b7fc textrendering/texthandling/stext/TXTGLOBL.CPP --- a/textrendering/texthandling/stext/TXTGLOBL.CPP Mon May 03 14:13:26 2010 +0300 +++ b/textrendering/texthandling/stext/TXTGLOBL.CPP Thu Jun 24 11:18:23 2010 +0800 @@ -24,6 +24,11 @@ #include "TXTGLOBL.H" #include "TXTSTD.H" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "TXTGLOBLTraces.h" +#endif + /** @internalAll @@ -56,7 +61,15 @@ Default is EDefaultTextGranularity bytes (=256). @return Pointer to the global text object. */ { + if (aGlobalParaLayer==NULL) + { + OstTrace0( TRACE_FATAL, CGLOBALTEXT_NEWL, "ENullFormatLayerHandle" ); + } __ASSERT_ALWAYS(aGlobalParaLayer!=NULL,Panic(ENullFormatLayerHandle)); + if (aGlobalCharLayer==NULL) + { + OstTrace0( TRACE_FATAL, DUP1_CGLOBALTEXT_NEWL, "ENullFormatLayerHandle" ); + } __ASSERT_ALWAYS(aGlobalCharLayer!=NULL,Panic(ENullFormatLayerHandle)); CGlobalText* self=new(ELeave) CGlobalText(aGlobalParaLayer,aGlobalCharLayer); @@ -74,7 +87,15 @@ restored from the specified read-stream. The global text object *uses* (does not own) the supplied global format layers.*/ { + if (aGlobalParaLayer==NULL) + { + OstTrace0( TRACE_FATAL, DUP2_CGLOBALTEXT_NEWL, "ENullFormatLayerHandle" ); + } __ASSERT_ALWAYS(aGlobalParaLayer!=NULL,Panic(ENullFormatLayerHandle)); + if (aGlobalCharLayer==NULL) + { + OstTrace0( TRACE_FATAL, DUP3_CGLOBALTEXT_NEWL, "ENullFormatLayerHandle" ); + } __ASSERT_ALWAYS(aGlobalCharLayer!=NULL,Panic(ENullFormatLayerHandle)); CGlobalText* self=new(ELeave) CGlobalText(aGlobalParaLayer,aGlobalCharLayer); @@ -235,6 +256,10 @@ formatting. @param aStartPos The start position for the view. */ { + if (aStartPos<0 || aStartPos>DocumentLength()) + { + OstTrace0( TRACE_FATAL, CGLOBALTEXT_GETCHARS, "ECharPosBeyondDocument" ); + } __ASSERT_ALWAYS(aStartPos>=0 && aStartPos<=DocumentLength(),Panic(ECharPosBeyondDocument)); aView.Set(Read(aStartPos));