From: Cristy Date: Fri, 17 Nov 2017 16:22:32 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.7-12~79 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91f238ccb5a65addcc72f3b9098ec1febb918cba;p=imagemagick ... --- diff --git a/MagickCore/resource.c b/MagickCore/resource.c index 383ece4f0..a65c5a328 100644 --- a/MagickCore/resource.c +++ b/MagickCore/resource.c @@ -563,8 +563,7 @@ MagickExport int AcquireUniqueFileResource(char *path) *p; register ssize_t - i, - j; + i; static const char portable_filename[65] = @@ -586,8 +585,11 @@ MagickExport int AcquireUniqueFileResource(char *path) UnlockSemaphoreInfo(resource_semaphore); } file=(-1); - for (j=0; j < (ssize_t) TMP_MAX; j++) + for (i=0; i < (ssize_t) TMP_MAX; i++) { + register ssize_t + j; + /* Get temporary pathname. */ @@ -595,9 +597,9 @@ MagickExport int AcquireUniqueFileResource(char *path) key=GetRandomKey(random_info,6); p=path+strlen(path)-strlen(MagickPathTemplate); datum=GetStringInfoDatum(key); - for (i=0; i < (ssize_t) GetStringInfoLength(key); i++) + for (j=0; j < (ssize_t) GetStringInfoLength(key); j++) { - c=(int) (datum[i] & 0x3f); + c=(int) (datum[j] & 0x3f); *p++=portable_filename[c]; } key=DestroyStringInfo(key); @@ -617,9 +619,9 @@ MagickExport int AcquireUniqueFileResource(char *path) key=GetRandomKey(random_info,strlen(MagickPathTemplate)); p=path+strlen(path)-strlen(MagickPathTemplate); datum=GetStringInfoDatum(key); - for (i=0; i < (ssize_t) GetStringInfoLength(key); i++) + for (j=0; j < (ssize_t) GetStringInfoLength(key); j++) { - c=(int) (datum[i] & 0x3f); + c=(int) (datum[j] & 0x3f); *p++=portable_filename[c]; } key=DestroyStringInfo(key);