ICU-57132.0.1.tar.gz

[apple/icu.git] / icuSources / layout / ExtensionSubtables.cpp

diff --git a/icuSources/layout/ExtensionSubtables.cpp b/icuSources/layout/ExtensionSubtables.cpp
index 813caeb3708fed0262bd732e3cb54d9f781382c0..8ac03a2bb845f2ef1f6ec5ca8a8f3fe7edfa639d 100644 (file)
--- a/icuSources/layout/ExtensionSubtables.cpp
+++ b/icuSources/layout/ExtensionSubtables.cpp
@@ -1,7 +1,7 @@
 /*
  * %W% %E%
  *
 /*
  * %W% %E%
  *

- * (C) Copyright IBM Corp. 2008-2011 - All Rights Reserved
+ * (C) Copyright IBM Corp. 2008-2013 - All Rights Reserved

  *
  */
 
  *
  */
 


@@ -26,6 +26,8 @@ static inline le_uint32 READ_LONG(le_uint32 code) {
 le_uint32 ExtensionSubtable::process(const LookupProcessor *lookupProcessor, le_uint16 lookupType,
                                       GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const
 {
 le_uint32 ExtensionSubtable::process(const LookupProcessor *lookupProcessor, le_uint16 lookupType,
                                       GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const
 {

+    const LEReferenceTo<ExtensionSubtable> thisRef(lookupProcessor->getReference(), success); // create a reference to this
+

     if (LE_FAILURE(success)) {
         return 0;
     }
     if (LE_FAILURE(success)) {
         return 0;
     }


@@ -34,9 +36,11 @@ le_uint32 ExtensionSubtable::process(const LookupProcessor *lookupProcessor, le_
 
     if (elt != lookupType) {      
         le_uint32 extOffset = READ_LONG(extensionOffset);
 
     if (elt != lookupType) {      
         le_uint32 extOffset = READ_LONG(extensionOffset);

-        LookupSubtable *subtable = (LookupSubtable *) ((char *) this + extOffset);
+        LEReferenceTo<LookupSubtable> subtable(thisRef, success, extOffset);

 
 

-        return lookupProcessor->applySubtable(subtable, elt, glyphIterator, fontInstance, success);
+        if(LE_SUCCESS(success)) {
+          return lookupProcessor->applySubtable(subtable, elt, glyphIterator, fontInstance, success);
+        }

     }
 
     return 0;
     }
 
     return 0;