qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java | 2 +- qadevOOo/tests/java/ifc/io/_XOutputStream.java | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-)
New commits: commit e46baa9e04a7715f35b7a068dde6cbabc6dd4775 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 20 11:07:58 2016 +0000 coverity#1326457 Dereference null return value Change-Id: I8bb949a364b3ccd9ccbec9a8275b505518e8f092 diff --git a/qadevOOo/tests/java/ifc/io/_XOutputStream.java b/qadevOOo/tests/java/ifc/io/_XOutputStream.java index 01caa6f..c183002 100644 --- a/qadevOOo/tests/java/ifc/io/_XOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XOutputStream.java @@ -83,12 +83,16 @@ public class _XOutputStream extends MultiMethodTest { res = false; } - XInputStream xInStream = checker.getInStream(); byte[][] readData = new byte[1][data.length]; - try { - xInStream.readBytes(readData, data.length); - } catch(com.sun.star.io.IOException e) { - log.println("Couldn't read data:" + e); + XInputStream xInStream = checker.getInStream(); + if (xInStream == null) { + try { + xInStream.readBytes(readData, data.length); + } catch(com.sun.star.io.IOException e) { + log.println("Couldn't read data:" + e); + res = false; + } + } else { res = false; } commit b45de8782ce6be2250f82bc19c4f298ede8a2f43 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 20 11:03:40 2016 +0000 coverity#1326464 Dereference null return value Change-Id: I3100f2a9ea1362c6ace7caad4c3b6e59f7f4cb86 diff --git a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java index e2de9f6c..81a92e7 100644 --- a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java +++ b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java @@ -58,7 +58,7 @@ public class _XViewDataSupplier extends MultiMethodTest { oObj.setViewData(xAccess); XIndexAccess xAccess2 = oObj.getViewData(); String newView = getViewID(xAccess2); - tRes.tested("setViewData()", newView.equals(myview)); + tRes.tested("setViewData()", newView != null && newView.equals(myview)); } }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits