From 5b9ee019d61176c7b92ee4fda9819674d2ed6a66 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Fri, 10 Feb 2017 10:38:28 +0100 Subject: [PATCH] [#5858] Add safety checks --- jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java index 413f1d8973..cdc14da687 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java @@ -735,8 +735,9 @@ final class LoaderImpl implements for (int i = 0; i < row.length; i++) if (StringUtils.equals(nullString, row[i])) row[i] = null; - else if (fields[i].getType() == byte[].class && row[i] instanceof String) - row[i] = DatatypeConverter.parseBase64Binary((String) row[i]); + else if (i < fields.length && fields[i] != null) + if (fields[i].getType() == byte[].class && row[i] instanceof String) + row[i] = DatatypeConverter.parseBase64Binary((String) row[i]); // TODO: In batch mode, we can probably optimise this by not creating // new statements every time, just to convert bind values to their