diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-09-20 16:42:12 -0700 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-09-20 16:42:12 -0700 |
| commit | 8312836c7407d2398285432a11db13f2f79570e3 (patch) | |
| tree | 21bc02fe77f56bc623c765a55574df4da3f62a85 | |
| parent | 308c0a727ec496ff551f67052b0835de3c152c11 (diff) | |
| parent | 7958793342783a67f2ebbb2db1abf01474d3c1f4 (diff) | |
| download | php-git-8312836c7407d2398285432a11db13f2f79570e3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -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 ce747378aa..543bce5088 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: |