Fixed a null pointer access in libmeegotouch when creating a MOriginContainer object in MStyleSheetPrivate::combine() method.
Signed-off-by: Jukka Selesniemi <[email protected]> --- src/corelib/style/mstylesheet.cpp | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/corelib/style/mstylesheet.cpp b/src/corelib/style/mstylesheet.cpp index b911809..0e1c0d6 100644 --- a/src/corelib/style/mstylesheet.cpp +++ b/src/corelib/style/mstylesheet.cpp @@ -377,12 +377,13 @@ bool MStyleSheetPrivate::combine(MStyle *style, const CacheEntry &entry, const S if (!isHigherPriority(old, info.selector, info.classPriority, info.parentPriority)) { continue; } - } - // override - MOriginContainer *tempMOriginCont = new MOriginContainer(attribute, info.selector, info.classPriority, info.parentPriority, info.filename, old->stylesheet); - data[attribute->name] = tempMOriginCont; - tempMOriginContainers.append(tempMOriginCont); + // override + MOriginContainer *tempMOriginCont = new MOriginContainer(attribute, info.selector, info.classPriority, + info.parentPriority, info.filename, old->stylesheet); + data[attribute->name] = tempMOriginCont; + tempMOriginContainers.append(tempMOriginCont); + } } } -- 1.7.0.4 _______________________________________________ MeeGo-dev mailing list [email protected] http://lists.meego.com/listinfo/meego-dev
