archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source
This commit is contained in:
Nikita Popov 2019-07-29 11:26:36 +02:00
commit 2b10f6299b
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
ext/exif/exif.c
View file

@ -1514,6 +1514,20 @@ static void php_ifd_set32u(char *data, size_t value, int motorola_intel)
} }
/* }}} */ /* }}} */
static float php_ifd_get_float(char *data) {
/* Copy to avoid alignment issues */
float f;
memcpy(&f, data, sizeof(float));
return f;
}
static double php_ifd_get_double(char *data) {
/* Copy to avoid alignment issues */
double f;
memcpy(&f, data, sizeof(double));
return f;
}
#ifdef EXIF_DEBUG #ifdef EXIF_DEBUG
char * exif_dump_data(int *dump_free, int format, int components, int length, int motorola_intel, char *value_ptr) /* {{{ */ char * exif_dump_data(int *dump_free, int format, int components, int length, int motorola_intel, char *value_ptr) /* {{{ */
{ {
@ -1626,12 +1640,12 @@ static double exif_convert_any_format(void *value, int format, int motorola_inte
#ifdef EXIF_DEBUG #ifdef EXIF_DEBUG
php_error_docref(NULL, E_NOTICE, "Found value of type single"); php_error_docref(NULL, E_NOTICE, "Found value of type single");
#endif #endif
return (double)*(float *)value; return (double) php_ifd_get_float(value);
case TAG_FMT_DOUBLE: case TAG_FMT_DOUBLE:
#ifdef EXIF_DEBUG #ifdef EXIF_DEBUG
php_error_docref(NULL, E_NOTICE, "Found value of type double"); php_error_docref(NULL, E_NOTICE, "Found value of type double");
#endif #endif
return *(double *)value; return php_ifd_get_double(value);
} }
return 0; return 0;
} }
@ -1689,12 +1703,12 @@ static size_t exif_convert_any_to_int(void *value, int format, int motorola_inte
#ifdef EXIF_DEBUG #ifdef EXIF_DEBUG
php_error_docref(NULL, E_NOTICE, "Found value of type single"); php_error_docref(NULL, E_NOTICE, "Found value of type single");
#endif #endif
return (size_t)*(float *)value; return (size_t) php_ifd_get_float(value);
case TAG_FMT_DOUBLE: case TAG_FMT_DOUBLE:
#ifdef EXIF_DEBUG #ifdef EXIF_DEBUG
php_error_docref(NULL, E_NOTICE, "Found value of type double"); php_error_docref(NULL, E_NOTICE, "Found value of type double");
#endif #endif
return (size_t)*(double *)value; return (size_t) php_ifd_get_double(value);
} }
return 0; return 0;
} }
@ -2161,13 +2175,13 @@ static void exif_iif_add_value(image_info_type *image_info, int section_index, c
#ifdef EXIF_DEBUG #ifdef EXIF_DEBUG
php_error_docref(NULL, E_WARNING, "Found value of type single"); php_error_docref(NULL, E_WARNING, "Found value of type single");
#endif #endif
info_value->f = *(float *)value; info_value->f = php_ifd_get_float(value);
break; break;
case TAG_FMT_DOUBLE: case TAG_FMT_DOUBLE:
#ifdef EXIF_DEBUG #ifdef EXIF_DEBUG
php_error_docref(NULL, E_WARNING, "Found value of type double"); php_error_docref(NULL, E_WARNING, "Found value of type double");
#endif #endif
info_value->d = *(double *)value; info_value->d = php_ifd_get_double(value);
break; break;
} }
} }