diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-09-20 16:42:31 -0700 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-09-20 16:42:31 -0700 |
| commit | 90fcf0f52a533225e9e1f823d9e292b759e156b6 (patch) | |
| tree | 3c4dced424933f9c35c8379865722e5f409c24c9 /ext/fileinfo | |
| parent | 6219a4e844e82f8eacd9ad6d24bb92739dcd6ff6 (diff) | |
| parent | 8312836c7407d2398285432a11db13f2f79570e3 (diff) | |
| download | php-git-90fcf0f52a533225e9e1f823d9e292b759e156b6.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'ext/fileinfo')
| -rw-r--r-- | ext/fileinfo/libmagic/apprentice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c index 41a3ac5239..c1dc5aa1fa 100644 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@ -1272,7 +1272,7 @@ file_signextend(struct magic_set *ms, struct magic *m, uint64_t v) * the sign extension must have happened. */ case FILE_BYTE: - v = (char) v; + v = (signed char) v; break; case FILE_SHORT: case FILE_BESHORT: |