diff options
author | Andrea Faulds <ajf@ajf.me> | 2014-09-21 00:47:46 +0100 |
---|---|---|
committer | Andrea Faulds <ajf@ajf.me> | 2014-09-21 00:47:46 +0100 |
commit | e1fe5cb8c2ba47581c079d2b91e2fede29181dfe (patch) | |
tree | 749dab4acfbd0576f06624f74597253783a9f7ad /ext | |
parent | 16404d0cac820ccf0027e4cc3c15fa5573e75317 (diff) | |
parent | 90fcf0f52a533225e9e1f823d9e292b759e156b6 (diff) | |
download | php-git-e1fe5cb8c2ba47581c079d2b91e2fede29181dfe.tar.gz |
Merge branch 'master' of git.php.net:php-src
Diffstat (limited to 'ext')
-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: |