AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove more null pointer checks before free() calls

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul
2012-09-03 08:12:04 -06:00
parent 2276bb991a
commit 2ffc7fd2d2
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/main/texcompress_fxt1.c
View File

@@ -99,8 +99,7 @@ _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS)
fxt1_encode(srcWidth, srcHeight, 3, pixels, srcRowStride,
dst, dstRowStride);
if (tempImage)
free((void*) tempImage);
free((void*) tempImage);
return GL_TRUE;
}
@@ -149,8 +148,7 @@ _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS)
fxt1_encode(srcWidth, srcHeight, 4, pixels, srcRowStride,
dst, dstRowStride);
if (tempImage)
free((void*) tempImage);
free((void*) tempImage);
return GL_TRUE;
}

16
src/mesa/main/texcompress_rgtc.c
View File

@@ -129,8 +129,8 @@ _mesa_texstore_red_rgtc1(TEXSTORE_PARAMS)
}
blkaddr += dstRowDiff;
}
if (tempImage)
free((void *) tempImage);
free((void *) tempImage);
return GL_TRUE;
}
@@ -176,8 +176,8 @@ _mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS)
}
blkaddr += dstRowDiff;
}
if (tempImage)
free((void *) tempImage);
free((void *) tempImage);
return GL_TRUE;
}
@@ -230,8 +230,8 @@ _mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS)
}
blkaddr += dstRowDiff;
}
if (tempImage)
free((void *) tempImage);
free((void *) tempImage);
return GL_TRUE;
}
@@ -285,8 +285,8 @@ _mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS)
}
blkaddr += dstRowDiff;
}
if (tempImage)
free((void *) tempImage);
free((void *) tempImage);
return GL_TRUE;
}

12
src/mesa/main/texcompress_s3tc.c
View File

@@ -203,8 +203,7 @@ _mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)
_mesa_warning(ctx, "external dxt library not available: texstore_rgb_dxt1");
}
if (tempImage)
free((void *) tempImage);
free((void *) tempImage);
return GL_TRUE;
}
@@ -256,8 +255,7 @@ _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)
_mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt1");
}
if (tempImage)
free((void*) tempImage);
free((void*) tempImage);
return GL_TRUE;
}
@@ -308,8 +306,7 @@ _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)
_mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt3");
}
if (tempImage)
free((void *) tempImage);
free((void *) tempImage);
return GL_TRUE;
}
@@ -360,8 +357,7 @@ _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
_mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt5");
}
if (tempImage)
free((void *) tempImage);
free((void *) tempImage);
return GL_TRUE;
}