ICU 56 update step 1

source/samples/layout/paragraph.cpp

 /*
  *******************************************************************************
  *
- *   Copyright (C) 1999-2007, International Business Machines
+ *   Copyright (C) 1999-2015, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   file name:  Paragraph.cpp
  *
  *   created on: 09/06/2000
  *   created by: Eric R. Mader
  */
 
 #include "unicode/utypes.h"
@@ skipping 93 matching lines @@
         if (pEnd == NULL) {
             pEnd = &fChars[charCount];
         }
 
         if (pEnd != pStart) {
             subsetFontRuns(fontRuns, pStart - fChars, pEnd - fChars, &fr);
 
             paragraphLayout = new ParagraphLayout(pStart, pEnd - pStart, &fr, NULL, NULL, locales, fParagraphLevel, FALSE, status);
 
             if (LE_FAILURE(status)) {
+                delete paragraphLayout;
                 break; // return? something else?
             }
 
             if (fParagraphLevel == UBIDI_DEFAULT_LTR) {
                 fParagraphLevel = paragraphLayout->getParagraphLevel();
             }
 
             pAscent  = paragraphLayout->getAscent();
             pDescent = paragraphLayout->getDescent();
             pLeading = paragraphLayout->getLeading();
@@ skipping 28 matching lines @@
     fLineHeight = ascent + descent + leading;
     fAscent     = ascent;
 }
 
 Paragraph::~Paragraph()
 {
     for (le_int32 line = 0; line < fLineCount; line += 1) {
         delete /*(LineInfo *)*/ fLines[line];
     }
 
+    for (le_int32 paragraph = 0; paragraph < fParagraphCount; paragraph += 1) {
+        delete fParagraphLayout[paragraph];
+    }
+
     LE_DELETE_ARRAY(fLines);
-    delete fParagraphLayout;
+    LE_DELETE_ARRAY(fParagraphLayout);
     LE_DELETE_ARRAY(fChars);
 }
 
 void Paragraph::addLine(const ParagraphLayout::Line *line)
 {
     if (fLineCount >= fLinesMax) {
         fLines = (const ParagraphLayout::Line **) LE_GROW_ARRAY(fLines, fLinesMax + fLinesGrow);
         fLinesMax += fLinesGrow;
     }
 
@@ skipping 91 matching lines @@
         if (LE_FAILURE(status)) {
                 delete result;
                 result = NULL;
         }
 
     LE_DELETE_ARRAY(text);
 
     return result;    
 }