[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc70d91713332676dd2b8aa77d67684258493b15
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 21 15:33:53 2014 +0000

    coverity#705966 Dereference before null check
    
    Change-Id: I74507ce67f928bdeb626d4070dbd2a45cc126521
    (cherry picked from commit 511d8bbbec6bc95d92a3ac6bbac4c68622738706)
    Reviewed-on: https://gerrit.libreoffice.org/8698
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 9880b7b..868e970 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2413,7 +2413,7 @@ bool GetSfntTable( TrueTypeFont* ttf, int nSubtableIndex,
         return false;
     *pRawLength = ttf->tlens[ nSubtableIndex ];
     *ppRawBytes = ttf->tables[ nSubtableIndex ];
-    bool bOk = (*pRawLength > 0) && (ppRawBytes != NULL);
+    bool bOk = (*pRawLength > 0) && (*ppRawBytes != NULL);
     return bOk;
 }