2017-09-28 15:11 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

* src/pp/ppcore.c ! fixed memory leak in unclosed extended block
harbour · Sep 28, 2017 · f9e8965 · f9e8965
1 parent 990feed
commit f9e8965
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -7,6 +7,10 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2017-09-28 15:11 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/pp/ppcore.c
+    ! fixed memory leak in unclosed extended block
+
 2017-09-28 14:55 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/pp/ppcore.c
     ! fixed line numbering in unclosed extended block

diff --git a/src/pp/ppcore.c b/src/pp/ppcore.c
@@ -1494,7 +1494,7 @@ static void hb_pp_getLine( PHB_PP_STATE pState )
 
       if( pEolTokenPtr &&
           ( pEolTokenPtr != pState->pNextTokenPtr ||
-            ( pState->iNestedBlock &&
+            ( pState->iNestedBlock && pState->pFile->iTokens &&
               ( pState->pFile->pLineBuf ? pState->pFile->nLineBufLen == 0 :
                                           pState->pFile->fEof ) ) ) )
       {
@@ -1507,6 +1507,8 @@ static void hb_pp_getLine( PHB_PP_STATE pState )
             iStartLine++;
             iLines++;
          }
+         if( pToken == NULL )
+            pState->pNextTokenPtr = pEolTokenPtr;
          *pEolTokenPtr = pToken;
       }