From: DRC <information@libjpeg-turbo.org>
Date: Mon, 1 Feb 2016 17:03:39 +0000 (-0600)
Subject: TJBench: Fix segfault on Android
X-Git-Tag: 1.4.90~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31280613821c659d5f6afe828d5e6fcf2ad0c18e;p=libjpeg-turbo

TJBench: Fix segfault on Android

For whatever reason, the "write" global variable in tjbench.c was
overriding the linkage with the write() system function.  This may have
affected other platforms as well but was not known to.
---

diff --git a/tjbench.c b/tjbench.c
index 036d631..81b36f6 100644
--- a/tjbench.c
+++ b/tjbench.c
@@ -46,7 +46,7 @@
 #define _throwbmp(m) _throw(m, bmpgeterr())
 
 int flags=TJFLAG_NOREALLOC, componly=0, decomponly=0, doyuv=0, quiet=0,
-	dotile=0, pf=TJPF_BGR, yuvpad=1, warmup=1, write=1;
+	dotile=0, pf=TJPF_BGR, yuvpad=1, warmup=1, dowrite=1;
 char *ext="ppm";
 const char *pixFormatStr[TJ_NUMPF]=
 {
@@ -214,7 +214,7 @@ int decomp(unsigned char *srcbuf, unsigned char **jpegbuf,
 		}
 	}
 
-	if (!write) goto bailout;
+	if (!dowrite) goto bailout;
 
 	if(sf.num!=1 || sf.denom!=1)
 		snprintf(sizestr, 20, "%d_%d", sf.num, sf.denom);
@@ -425,7 +425,7 @@ int fullTest(unsigned char *srcbuf, int w, int h, int subsamp, int jpegqual,
 			printf("                  Output bit stream:  %f Megabits/sec\n",
 				(double)totaljpegsize*8./1000000.*(double)iter/elapsed);
 		}
-		if(tilew==w && tileh==h && write)
+		if(tilew==w && tileh==h && dowrite)
 		{
 			snprintf(tempstr, 1024, "%s_%s_Q%d.jpg", filename, subName[subsamp],
 				jpegqual);
@@ -911,7 +911,7 @@ int main(int argc, char *argv[])
 				}
 			}
 			if(!strcasecmp(argv[i], "-componly")) componly=1;
-			if(!strcasecmp(argv[i], "-nowrite")) write=0;
+			if(!strcasecmp(argv[i], "-nowrite")) dowrite=0;
 		}
 	}