diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-09-20 16:40:02 -0700 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-09-20 16:40:02 -0700 |
| commit | 7958793342783a67f2ebbb2db1abf01474d3c1f4 (patch) | |
| tree | 0cda5fdffb6da8dce6655aef6c6cb26657b4f07a | |
| parent | 5e977e69e144ca92868ae73cd3563eb473b75937 (diff) | |
| parent | e64da8c20df3ec28bd2417924b207b870e9ab99f (diff) | |
| download | php-git-7958793342783a67f2ebbb2db1abf01474d3c1f4.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -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 fd82564bff..b137405da2 100644 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@ -1269,7 +1269,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: |