Merge "Silence clang static analyzer warnings" (01e307d4) · Commits · e / os / android_frameworks_base

rs/jni/android_renderscript_RenderScript.cpp

+34 −22

Original line number	Diff line number	Diff line
		@@ -421,15 +421,22 @@ nClosureCreate(JNIEnv *_env, jobject _this, jlong con, jlong kernelID,
		goto exit;
		}

		if (numValues > 0) {
		fieldIDs = (RsScriptFieldID)alloca(sizeof(RsScriptFieldID) numValues);
		if (fieldIDs == nullptr) {
		goto exit;
		}
		} else {
		// numValues == 0
		// alloca(0) implementation is platform-dependent.
		fieldIDs = nullptr;
		}

		for (size_t i = 0; i < numValues; i++) {
		fieldIDs[i] = (RsScriptFieldID)jFieldIDs[i];
		}

		if (numDependencies > 0) {
		depClosures = (RsClosure)alloca(sizeof(RsClosure) numDependencies);
		if (depClosures == nullptr) {
		goto exit;
		@@ -447,6 +454,11 @@ nClosureCreate(JNIEnv *_env, jobject _this, jlong con, jlong kernelID,
		for (size_t i = 0; i < numDependencies; i++) {
		depFieldIDs[i] = (RsClosure)jDepFieldIDs[i];
		}
		} else {
		// alloca(0) implementation is platform-dependent.
		depClosures = nullptr;
		depFieldIDs = nullptr;
		}

		ret = (jlong)(uintptr_t)rsClosureCreate(
		(RsContext)con, (RsScriptKernelID)kernelID, (RsAllocation)returnValue,
		@@ -853,7 +865,7 @@ nContextCreateGL(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer,
		jint samplesMin, jint samplesPref, jfloat samplesQ,
		jint dpi)
		{
		RsSurfaceConfig sc;
		RsSurfaceConfig sc = {};
		sc.alphaMin = alphaMin;
		sc.alphaPref = alphaPref;
		sc.colorMin = colorMin;
		@@ -1403,8 +1415,8 @@ nAllocationElementData(JNIEnv *_env, jobject _this, jlong con, jlong alloc,
		jint xoff, jint yoff, jint zoff,
		jint lod, jint compIdx, jbyteArray data, jint sizeBytes)
		{
		jint len = _env->GetArrayLength(data);
		if (kLogApi) {
		jint len = _env->GetArrayLength(data);
		ALOGD("nAllocationElementData, con(%p), alloc(%p), xoff(%i), yoff(%i), zoff(%i), comp(%i), len(%i), "
		"sizeBytes(%i)", (RsContext)con, (RsAllocation)alloc, xoff, yoff, zoff, compIdx, len,
		sizeBytes);
		@@ -1545,8 +1557,8 @@ nAllocationElementRead(JNIEnv *_env, jobject _this, jlong con, jlong alloc,
		jint xoff, jint yoff, jint zoff,
		jint lod, jint compIdx, jbyteArray data, jint sizeBytes)
		{
		jint len = _env->GetArrayLength(data);
		if (kLogApi) {
		jint len = _env->GetArrayLength(data);
		ALOGD("nAllocationElementRead, con(%p), alloc(%p), xoff(%i), yoff(%i), zoff(%i), comp(%i), len(%i), "
		"sizeBytes(%i)", (RsContext)con, (RsAllocation)alloc, xoff, yoff, zoff, compIdx, len,
		sizeBytes);