From ec3034c2ba034b675bb7332d91d00a1c4860c6b2 Mon Sep 17 00:00:00 2001
From: Robert Varga <nite@hq.sk>
Date: Wed, 10 Feb 2016 16:00:16 +0100
Subject: newIntArray() may fail

Allocation of the integer array may fail, guard against NPE.

Change-Id: I3e860153597638392c9b669a6ad586fd2e03a64d
Signed-off-by: Robert Varga <nite@hq.sk>
---
 vpp-japi/japi/vppjni.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'vpp-japi')

diff --git a/vpp-japi/japi/vppjni.c b/vpp-japi/japi/vppjni.c
index 45011467ebd..3c80ff9240c 100644
--- a/vpp-japi/japi/vppjni.c
+++ b/vpp-japi/japi/vppjni.c
@@ -894,11 +894,14 @@ static jintArray create_array_of_bd_ids(JNIEnv * env, jint bd_id)
     }
 
     jintArray bdidArray = (*env)->NewIntArray(env, vec_len(buf));
+    if (!bdidArray) {
+        goto out;
+    }
 
     (*env)->SetIntArrayRegion(env, bdidArray, 0, vec_len(buf), (int*)buf);
 
+out:
     vec_free(buf);
-
     return bdidArray;
 }
 
-- 
cgit 1.2.3-korg