cvs: php4 /ext/exif exif.c

andi Wed May 2 15:49:48 2001 EDT Modified files: /php4/ext/exif exif.c Log: - Change strncpy()'s to strlcpy()'s Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.15 php4/ext/exif/exif.c:1.16 --- php4/ext/exif/exif.c:1.15 Mon Apr 30 05:43:32 2001 +++ php4/ext/exif/exif.c Wed May 2 15:49:48 2001 @@ -560,27 +560,27 @@ switch(Tag) { case TAG_MAKE: - strncpy(ImageInfo->CameraMake, ValuePtr, 31); + strlcpy(ImageInfo->CameraMake, ValuePtr, sizeof(ImageInfo->CameraMake)); break; case TAG_MODEL: - strncpy(ImageInfo->CameraModel, ValuePtr, 63); + strlcpy(ImageInfo->CameraModel, ValuePtr, sizeof(ImageInfo->CameraModel)); break; case TAG_GPSINFO: - strncpy(ImageInfo->GPSinfo, ValuePtr, 47); + strlcpy(ImageInfo->GPSinfo, ValuePtr, sizeof(ImageInfo->GPSinfo)); break; case TAG_EXIFVERSION: - strncpy(ImageInfo->ExifVersion, ValuePtr, 15); + strlcpy(ImageInfo->ExifVersion, ValuePtr, sizeof(ImageInfo->ExifVersion)); break; case TAG_COPYRIGHT: - strncpy(ImageInfo->Copyright, ValuePtr, 31); + strlcpy(ImageInfo->Copyright, ValuePtr, sizeof(ImageInfo->Copyright)); break; case TAG_SOFTWARE: - strncpy(ImageInfo->Software, ValuePtr, 31); + strlcpy(ImageInfo->Software, ValuePtr, sizeof(ImageInfo->Software)); break; case TAG_ORIENTATION: @@ -592,7 +592,7 @@ break; case TAG_DATETIME_ORIGINAL: - strncpy(ImageInfo->DateTime, ValuePtr, 19); + strlcpy(ImageInfo->DateTime, ValuePtr, sizeof(ImageInfo->DateTime)); break; case TAG_USERCOMMENT: @@ -613,13 +613,13 @@ int c; c = (ValuePtr)[a]; if (c != '\0' && c != ' ') { - strncpy(ImageInfo->Comments, a+ValuePtr, 199); + strlcpy(ImageInfo->Comments, a+ValuePtr, sizeof(ImageInfo->Comments)); break; } } } else { - strncpy(ImageInfo->Comments, ValuePtr, 199); + strlcpy(ImageInfo->Comments, ValuePtr, sizeof(ImageInfo->Comments)); } break; @@ -729,15 +729,15 @@ break; case TAG_SOFTWARERELEASE: - strncpy(ImageInfo->SoftwareRelease, ValuePtr, 15); + strlcpy(ImageInfo->SoftwareRelease, ValuePtr, sizeof(ImageInfo->SoftwareRelease)); break; case TAG_PICTINFO: - strncpy(ImageInfo->PictInfo, ValuePtr, 63); + strlcpy(ImageInfo->PictInfo, ValuePtr, sizeof(ImageInfo->PictInfo)); break; case TAG_CAMERAID: - strncpy(ImageInfo->CameraId, ValuePtr, 63); + strlcpy(ImageInfo->CameraId, ValuePtr, sizeof(ImageInfo->CameraId)); break; } @@ -986,7 +986,7 @@ memset(Sections, 0, sizeof(*Sections)); tmp = php_basename(FileName,strlen(FileName)); - strncpy(ImageInfo->FileName, tmp, 119); + strlcpy(ImageInfo->FileName, tmp, sizeof(ImageInfo->FileName)); efree(tmp); ImageInfo->FocalLength = 0; ImageInfo->ExposureTime = 0;