[Libreoffice-commits] core.git: qadevOOo/runner

Robert Antoni Buj i Gelonch robert.buj at gmail.com
Thu Oct 30 01:36:31 PDT 2014


 qadevOOo/runner/helper/APIDescGetter.java |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 1e7382cb45759908cd3d639c839dcd5633dbadd1
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Wed Oct 29 16:48:00 2014 +0100

    runner: Dereference of the result of readLine() without nullcheck
    
    Change-Id: I3d02436446a79137ce42b1a190c9e3985fbb9246
    Reviewed-on: https://gerrit.libreoffice.org/12135
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java
index 4171dc2..71c8981 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -595,16 +595,20 @@ public class APIDescGetter extends DescGetter
                 {
                     String entry = buf.readLine();
 
-                    if (entry.endsWith(sEndsWithCSVName))
+                    if (entry != null)
                     {
-                        System.out.println("FOUND  ####");
-                        InputStream input = this.getClass().getResourceAsStream("/objdsc/" +
-                                module +
-                                "/" +
-                                entry);
-                        csvFile = new BufferedReader(
-                                new InputStreamReader(input));
-                        found = true;
+                        if (entry.endsWith(sEndsWithCSVName))
+                        {
+                            System.out.println("FOUND  ####");
+                            InputStream input =
+                                this.getClass().getResourceAsStream("/objdsc/" +
+                                    module +
+                                    "/" +
+                                    entry);
+                            csvFile =
+                                new BufferedReader(new InputStreamReader(input));
+                            found = true;
+                        }
                     }
                 }
 


More information about the Libreoffice-commits mailing list