Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

updated libmagic.patch

  • Loading branch information...
commit a35d38661225ed171141e3818362a2ee5d63ec2a 1 parent 9de5dca
Anatol Belski weltling authored

Showing 1 changed file with 66 additions and 87 deletions. Show diff stats Hide diff stats

  1. +66 87 ext/fileinfo/libmagic.patch
153 ext/fileinfo/libmagic.patch
... ... @@ -1,6 +1,6 @@
1 1 diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
2 2 --- libmagic.orig/apprentice.c 2013-03-21 18:45:14.000000000 +0100
3   -+++ libmagic/apprentice.c 2013-04-01 17:10:36.710373557 +0200
  3 ++++ libmagic/apprentice.c 2013-04-08 16:14:17.828357711 +0200
4 4 @@ -29,6 +29,8 @@
5 5 * apprentice - make one pass through /etc/magic, learning its secrets.
6 6 */
@@ -180,7 +180,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
180 180 return NULL;
181 181 }
182 182
183   -@@ -499,22 +492,17 @@
  183 +@@ -499,22 +492,24 @@
184 184 {
185 185 if (map == NULL)
186 186 return;
@@ -193,8 +193,15 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
193 193 -#endif
194 194 - free(map->p);
195 195 - free(map);
196   -+ if (map->p != NULL && map->p != php_magic_database) {
197   -+ efree(map->p);
  196 ++ if (map->p != php_magic_database) {
  197 ++ int j;
  198 ++ for (j = 0; j < MAGIC_SETS; j++) {
  199 ++ if (map->magic[j])
  200 ++ efree(map->magic[j]);
  201 ++ }
  202 ++ if (map->p != NULL) {
  203 ++ efree(map->p);
  204 ++ }
198 205 + }
199 206 + efree(map);
200 207 }
@@ -208,7 +215,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
208 215 return NULL;
209 216 }
210 217 mlist->next = mlist->prev = mlist;
211   -@@ -533,10 +521,10 @@
  218 +@@ -533,10 +528,10 @@
212 219 struct mlist *next = ml->next;
213 220 if (ml->map)
214 221 apprentice_unmap(ml->map);
@@ -221,7 +228,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
221 228 }
222 229
223 230 /* const char *fn: list of magic files and directories */
224   -@@ -546,13 +534,28 @@
  231 +@@ -546,13 +541,28 @@
225 232 char *p, *mfn;
226 233 int file_err, errs = -1;
227 234 size_t i;
@@ -252,7 +259,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
252 259 file_oomem(ms, strlen(fn));
253 260 return -1;
254 261 }
255   -@@ -567,7 +570,7 @@
  262 +@@ -567,7 +577,7 @@
256 263 mlist_free(ms->mlist[i]);
257 264 while (i != 0);
258 265 }
@@ -261,7 +268,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
261 268 return -1;
262 269 }
263 270 }
264   -@@ -584,7 +587,7 @@
  271 +@@ -584,7 +594,7 @@
265 272 fn = p;
266 273 }
267 274
@@ -270,7 +277,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
270 277
271 278 if (errs == -1) {
272 279 for (i = 0; i < MAGIC_SETS; i++) {
273   -@@ -904,7 +907,7 @@
  280 +@@ -904,7 +914,7 @@
274 281
275 282 maxmagic[i] += ALLOC_INCR;
276 283 if ((mp = CAST(struct magic_entry *,
@@ -279,7 +286,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
279 286 NULL) {
280 287 file_oomem(ms, sizeof(*mp) * maxmagic[i]);
281 288 return -1;
282   -@@ -925,13 +928,24 @@
  289 +@@ -925,13 +935,24 @@
283 290 load_1(struct magic_set *ms, int action, const char *fn, int *errs,
284 291 struct magic_entry **mentry, uint32_t *mentrycount)
285 292 {
@@ -308,7 +315,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
308 315 if (errno != ENOENT)
309 316 file_error(ms, errno, "cannot read magic file `%s'",
310 317 fn);
311   -@@ -941,8 +955,7 @@
  318 +@@ -941,8 +962,7 @@
312 319
313 320 memset(&me, 0, sizeof(me));
314 321 /* read and parse this file */
@@ -318,7 +325,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
318 325 if (len == 0) /* null line, garbage, etc */
319 326 continue;
320 327 if (line[len - 1] == '\n') {
321   -@@ -994,14 +1007,13 @@
  328 +@@ -994,14 +1014,13 @@
322 329 goto again;
323 330 default:
324 331 (*errs)++;
@@ -336,7 +343,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
336 343 }
337 344
338 345 /*
339   -@@ -1080,7 +1092,7 @@
  346 +@@ -1080,7 +1099,7 @@
340 347 mentrycount += me[i].cont_count;
341 348
342 349 slen = sizeof(**ma) * mentrycount;
@@ -345,7 +352,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
345 352 file_oomem(ms, slen);
346 353 return -1;
347 354 }
348   -@@ -1102,14 +1114,14 @@
  355 +@@ -1102,14 +1121,14 @@
349 356 if (me == NULL)
350 357 return;
351 358 for (i = 0; i < nme; i++)
@@ -363,7 +370,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
363 370 struct magic_entry *mentry[MAGIC_SETS] = { NULL };
364 371 uint32_t mentrycount[MAGIC_SETS] = { 0 };
365 372 uint32_t i, j;
366   -@@ -1117,12 +1129,14 @@
  373 +@@ -1117,12 +1136,14 @@
367 374 char **filearr = NULL, *mfn;
368 375 struct stat st;
369 376 struct magic_map *map;
@@ -381,25 +388,25 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
381 388 file_oomem(ms, sizeof(*map));
382 389 return NULL;
383 390 }
384   -@@ -1131,23 +1145,37 @@
  391 +@@ -1131,23 +1152,37 @@
385 392 if (action == FILE_CHECK)
386 393 (void)fprintf(stderr, "%s\n", usg_hdr);
387 394
388   -+ {
389   -+ /* XXX the maxmagic has to be reset each time we load some new magic file.
390   -+ Where file commando is used it's not essential as the CLI process
391   -+ ends, multiple loading within the same process wouldn't work. */
392   -+ int k;
393   -+ for (k = 0; k < MAGIC_SETS; k++) {
394   -+ maxmagic[k] = 0;
395   -+ }
  395 ++ {
  396 ++ /* XXX the maxmagic has to be reset each time we load some new magic file.
  397 ++ Where file commando is used it's not essential as the CLI process
  398 ++ ends, multiple loading within the same process wouldn't work. */
  399 ++ int k;
  400 ++ for (k = 0; k < MAGIC_SETS; k++) {
  401 ++ maxmagic[k] = 0;
  402 ++ }
396 403 + }
397 404 +
398 405 /* load directory or file */
399 406 - if (stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) {
400 407 - dir = opendir(fn);
401   -+ /* FIXME: Read file names and sort them to prevent
402   -+ non-determinism. See Debian bug #488562. */
  408 ++ /* FIXME: Read file names and sort them to prevent
  409 ++ non-determinism. See Debian bug #488562. */
403 410 + if (php_sys_stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) {
404 411 + int mflen;
405 412 + char mfn[MAXPATHLEN];
@@ -426,7 +433,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
426 433 continue;
427 434 }
428 435 if (files >= maxfiles) {
429   -@@ -1155,45 +1183,44 @@
  436 +@@ -1155,24 +1190,23 @@
430 437 maxfiles = (maxfiles + 1) * 2;
431 438 mlen = maxfiles * sizeof(*filearr);
432 439 if ((filearr = CAST(char **,
@@ -457,35 +464,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
457 464 } else
458 465 load_1(ms, action, fn, &errs, mentry, mentrycount);
459 466 if (errs)
460   - goto out;
461   -
462   - for (j = 0; j < MAGIC_SETS; j++) {
463   -- /* Set types of tests */
464   -+ /* Set types of tests */
465   - for (i = 0; i < mentrycount[j]; ) {
466   - if (mentry[j][i].mp->cont_level != 0) {
467   -- i++;
468   -- continue;
469   -- }
470   -- i = set_text_binary(ms, mentry[j], mentrycount[j], i);
471   -+ i++;
472   -+ continue;
473   - }
474   -+ i = set_text_binary(ms, mentry[j], mentrycount[j], i);
475   -+ }
476   - qsort(mentry[j], mentrycount[j], sizeof(*mentry[j]),
477   - apprentice_sort);
478   -
479   -- /*
480   -+ /*
481   - * Make sure that any level 0 "default" line is last
482   - * (if one exists).
483   -- */
484   -+ */
485   - set_last_default(ms, mentry[j], mentrycount[j]);
486   -
487   - /* coalesce per file arrays into a single one */
488   -@@ -1211,9 +1238,9 @@
  467 +@@ -1211,9 +1245,9 @@
489 468 if (errs) {
490 469 for (j = 0; j < MAGIC_SETS; j++) {
491 470 if (map->magic[j])
@@ -497,7 +476,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
497 476 return NULL;
498 477 }
499 478 return map;
500   -@@ -1500,7 +1527,7 @@
  479 +@@ -1500,7 +1534,7 @@
501 480 if (me->cont_count == me->max_count) {
502 481 struct magic *nm;
503 482 size_t cnt = me->max_count + ALLOC_CHUNK;
@@ -506,7 +485,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
506 485 sizeof(*nm) * cnt))) == NULL) {
507 486 file_oomem(ms, sizeof(*nm) * cnt);
508 487 return -1;
509   -@@ -1515,7 +1542,7 @@
  488 +@@ -1515,7 +1549,7 @@
510 489 static const size_t len = sizeof(*m) * ALLOC_CHUNK;
511 490 if (me->mp != NULL)
512 491 return 1;
@@ -515,7 +494,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
515 494 file_oomem(ms, len);
516 495 return -1;
517 496 }
518   -@@ -1688,7 +1715,7 @@
  497 +@@ -1688,7 +1722,7 @@
519 498 m->type = get_standard_integer_type(l, &l);
520 499 else if (*l == 's' && !isalpha((unsigned char)l[1])) {
521 500 m->type = FILE_STRING;
@@ -524,7 +503,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
524 503 }
525 504 }
526 505 }
527   -@@ -1701,6 +1728,10 @@
  506 +@@ -1701,6 +1735,10 @@
528 507 if (m->type == FILE_INVALID) {
529 508 if (ms->flags & MAGIC_CHECK)
530 509 file_magwarn(ms, "type `%s' invalid", l);
@@ -535,7 +514,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
535 514 return -1;
536 515 }
537 516
538   -@@ -1709,7 +1740,7 @@
  517 +@@ -1709,7 +1747,7 @@
539 518
540 519 m->mask_op = 0;
541 520 if (*l == '~') {
@@ -544,7 +523,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
544 523 m->mask_op |= FILE_OPINVERSE;
545 524 else if (ms->flags & MAGIC_CHECK)
546 525 file_magwarn(ms, "'~' invalid for string types");
547   -@@ -1718,7 +1749,7 @@
  526 +@@ -1718,7 +1756,7 @@
548 527 m->str_range = 0;
549 528 m->str_flags = m->type == FILE_PSTRING ? PSTRING_1_LE : 0;
550 529 if ((op = get_op(*l)) != -1) {
@@ -553,7 +532,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
553 532 uint64_t val;
554 533 ++l;
555 534 m->mask_op |= op;
556   -@@ -1909,11 +1940,6 @@
  535 +@@ -1909,11 +1947,6 @@
557 536 if (check_format(ms, m) == -1)
558 537 return -1;
559 538 }
@@ -565,7 +544,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
565 544 m->mimetype[0] = '\0'; /* initialise MIME type to none */
566 545 return 0;
567 546 }
568   -@@ -2554,59 +2580,80 @@
  547 +@@ -2554,59 +2587,80 @@
569 548 private struct magic_map *
570 549 apprentice_map(struct magic_set *ms, const char *fn)
571 550 {
@@ -667,7 +646,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
667 646 if (*ptr != MAGICNO) {
668 647 if (swap4(*ptr) != MAGICNO) {
669 648 file_error(ms, 0, "bad magic in `%s'", dbname);
670   -@@ -2620,17 +2667,29 @@
  649 +@@ -2620,17 +2674,29 @@
671 650 else
672 651 version = ptr[1];
673 652 if (version != VERSIONNO) {
@@ -705,7 +684,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
705 684 }
706 685 map->magic[0] = CAST(struct magic *, map->p) + 1;
707 686 nentries = 0;
708   -@@ -2643,22 +2702,29 @@
  687 +@@ -2643,22 +2709,29 @@
709 688 map->magic[i + 1] = map->magic[i] + map->nmagic[i];
710 689 nentries += map->nmagic[i];
711 690 }
@@ -740,15 +719,15 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
740 719 return NULL;
741 720 }
742 721
743   -@@ -2679,14 +2745,23 @@
  722 +@@ -2679,14 +2752,23 @@
744 723 char *dbname;
745 724 int rv = -1;
746 725 uint32_t i;
747 726 + php_stream *stream;
  727 ++
  728 ++ TSRMLS_FETCH();
748 729
749 730 - dbname = mkdbname(ms, fn, 1);
750   -+ TSRMLS_FETCH();
751   -+
752 731 + dbname = mkdbname(ms, fn, 0);
753 732
754 733 if (dbname == NULL)
@@ -767,7 +746,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
767 746 file_error(ms, errno, "cannot open `%s'", dbname);
768 747 goto out;
769 748 }
770   -@@ -2696,31 +2771,33 @@
  749 +@@ -2696,31 +2778,33 @@
771 750 goto out;
772 751 }
773 752
@@ -807,7 +786,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
807 786 return rv;
808 787 }
809 788
810   -@@ -2733,6 +2810,7 @@
  789 +@@ -2733,6 +2817,7 @@
811 790 {
812 791 const char *p, *q;
813 792 char *buf;
@@ -815,7 +794,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
815 794
816 795 if (strip) {
817 796 if ((p = strrchr(fn, '/')) != NULL)
818   -@@ -2754,16 +2832,18 @@
  797 +@@ -2754,16 +2839,18 @@
819 798 q++;
820 799 /* Compatibility with old code that looked in .mime */
821 800 if (ms->flags & MAGIC_MIME) {
@@ -840,7 +819,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
840 819
841 820 /* Compatibility with old code that looked in .mime */
842 821 if (strstr(p, ".mime") != NULL)
843   -@@ -2853,7 +2933,7 @@
  822 +@@ -2853,7 +2940,7 @@
844 823 m->offset = swap4((uint32_t)m->offset);
845 824 m->in_offset = swap4((uint32_t)m->in_offset);
846 825 m->lineno = swap4((uint32_t)m->lineno);
@@ -851,7 +830,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
851 830 }
852 831 diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
853 832 --- libmagic.orig/ascmagic.c 2012-10-31 18:03:01.000000000 +0100
854   -+++ libmagic/ascmagic.c 2013-04-01 17:10:36.710373557 +0200
  833 ++++ libmagic/ascmagic.c 2013-04-08 15:42:57.328298809 +0200
855 834 @@ -139,7 +139,7 @@
856 835 /* malloc size is a conservative overestimate; could be
857 836 improved, or at least realloced after conversion. */
@@ -881,7 +860,7 @@ diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
881 860 }
882 861 diff -u libmagic.orig/cdf.c libmagic/cdf.c
883 862 --- libmagic.orig/cdf.c 2013-03-21 18:45:14.000000000 +0100
884   -+++ libmagic/cdf.c 2013-04-01 17:10:36.710373557 +0200
  863 ++++ libmagic/cdf.c 2013-04-08 15:42:57.328298809 +0200
885 864 @@ -43,7 +43,17 @@
886 865 #include <err.h>
887 866 #endif
@@ -944,7 +923,7 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
944 923 } else {
945 924 diff -u libmagic.orig/cdf.h libmagic/cdf.h
946 925 --- libmagic.orig/cdf.h 2012-10-31 18:03:01.000000000 +0100
947   -+++ libmagic/cdf.h 2013-04-01 17:10:36.710373557 +0200
  926 ++++ libmagic/cdf.h 2013-04-08 15:42:57.328298809 +0200
948 927 @@ -35,10 +35,12 @@
949 928 #ifndef _H_CDF_
950 929 #define _H_CDF_
@@ -987,7 +966,7 @@ diff -u libmagic.orig/cdf.h libmagic/cdf.h
987 966 void cdf_unpack_header(cdf_header_t *, char *);
988 967 diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
989 968 --- libmagic.orig/cdf_time.c 2012-10-31 18:03:01.000000000 +0100
990   -+++ libmagic/cdf_time.c 2013-04-01 17:10:36.710373557 +0200
  969 ++++ libmagic/cdf_time.c 2013-04-08 15:42:57.328298809 +0200
991 970 @@ -96,7 +96,7 @@
992 971 }
993 972
@@ -1047,7 +1026,7 @@ diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
1047 1026 static const char *ref = "Sat Apr 23 01:30:00 1977";
1048 1027 diff -u libmagic.orig/compress.c libmagic/compress.c
1049 1028 --- libmagic.orig/compress.c 2013-01-06 21:35:43.000000000 +0100
1050   -+++ libmagic/compress.c 2013-04-01 17:10:36.710373557 +0200
  1029 ++++ libmagic/compress.c 2013-04-08 15:42:57.328298809 +0200
1051 1030 @@ -32,6 +32,7 @@
1052 1031 * uncompress(method, old, n, newch) - uncompress old into new,
1053 1032 * using method, return sizeof new
@@ -1210,7 +1189,7 @@ diff -u libmagic.orig/compress.c libmagic/compress.c
1210 1189 +#endif /* if PHP_FILEINFO_UNCOMPRESS */
1211 1190 diff -u libmagic.orig/file.h libmagic/file.h
1212 1191 --- libmagic.orig/file.h 2013-02-18 16:40:59.000000000 +0100
1213   -+++ libmagic/file.h 2013-04-01 17:10:36.710373557 +0200
  1192 ++++ libmagic/file.h 2013-04-08 15:42:57.328298809 +0200
1214 1193 @@ -33,11 +33,9 @@
1215 1194 #ifndef __file_h__
1216 1195 #define __file_h__
@@ -1412,7 +1391,7 @@ diff -u libmagic.orig/file.h libmagic/file.h
1412 1391 #endif /* __file_h__ */
1413 1392 diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
1414 1393 --- libmagic.orig/fsmagic.c 2013-03-21 18:45:14.000000000 +0100
1415   -+++ libmagic/fsmagic.c 2013-04-01 17:10:36.710373557 +0200
  1394 ++++ libmagic/fsmagic.c 2013-04-08 15:42:57.328298809 +0200
1416 1395 @@ -59,27 +59,21 @@
1417 1396 # define minor(dev) ((dev) & 0xff)
1418 1397 #endif
@@ -1779,7 +1758,7 @@ diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
1779 1758 }
1780 1759 diff -u libmagic.orig/funcs.c libmagic/funcs.c
1781 1760 --- libmagic.orig/funcs.c 2012-10-31 18:03:01.000000000 +0100
1782   -+++ libmagic/funcs.c 2013-04-01 17:10:36.710373557 +0200
  1761 ++++ libmagic/funcs.c 2013-04-08 15:42:57.328298809 +0200
1783 1762 @@ -41,52 +41,42 @@
1784 1763 #if defined(HAVE_WCTYPE_H)
1785 1764 #include <wctype.h>
@@ -2068,7 +2047,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
2068 2047 +
2069 2048 diff -u libmagic.orig/magic.c libmagic/magic.c
2070 2049 --- libmagic.orig/magic.c 2013-01-11 17:43:09.000000000 +0100
2071   -+++ libmagic/magic.c 2013-04-01 17:10:36.710373557 +0200
  2050 ++++ libmagic/magic.c 2013-04-08 15:42:57.328298809 +0200
2072 2051 @@ -25,11 +25,6 @@
2073 2052 * SUCH DAMAGE.
2074 2053 */
@@ -2412,7 +2391,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
2412 2391 magic_error(struct magic_set *ms)
2413 2392 diff -u libmagic.orig/magic.h libmagic/magic.h
2414 2393 --- libmagic.orig/magic.h 2013-03-21 18:52:42.000000000 +0100
2415   -+++ libmagic/magic.h 2013-04-01 17:10:36.710373557 +0200
  2394 ++++ libmagic/magic.h 2013-04-08 15:42:57.328298809 +0200
2416 2395 @@ -87,6 +87,7 @@
2417 2396
2418 2397 const char *magic_getpath(const char *, int);
@@ -2431,7 +2410,7 @@ diff -u libmagic.orig/magic.h libmagic/magic.h
2431 2410
2432 2411 diff -u libmagic.orig/print.c libmagic/print.c
2433 2412 --- libmagic.orig/print.c 2013-03-21 18:45:14.000000000 +0100
2434   -+++ libmagic/print.c 2013-04-01 17:10:36.710373557 +0200
  2413 ++++ libmagic/print.c 2013-04-08 15:42:57.328298809 +0200
2435 2414 @@ -28,6 +28,8 @@
2436 2415 /*
2437 2416 * print.c - debugging printout routines
@@ -2661,7 +2640,7 @@ diff -u libmagic.orig/print.c libmagic/print.c
2661 2640 }
2662 2641 diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
2663 2642 --- libmagic.orig/readcdf.c 2012-10-31 18:03:01.000000000 +0100
2664   -+++ libmagic/readcdf.c 2013-04-01 17:10:36.710373557 +0200
  2643 ++++ libmagic/readcdf.c 2013-04-08 15:42:57.328298809 +0200
2665 2644 @@ -30,7 +30,11 @@
2666 2645 #endif
2667 2646
@@ -2724,7 +2703,7 @@ diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
2724 2703 return -1;
2725 2704 diff -u libmagic.orig/readelf.c libmagic/readelf.c
2726 2705 --- libmagic.orig/readelf.c 2013-03-21 18:45:14.000000000 +0100
2727   -+++ libmagic/readelf.c 2013-04-01 17:10:36.710373557 +0200
  2706 ++++ libmagic/readelf.c 2013-04-08 15:42:57.328298809 +0200
2728 2707 @@ -48,8 +48,8 @@
2729 2708 private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t,
2730 2709 off_t, int *, int);
@@ -2997,7 +2976,7 @@ diff -u libmagic.orig/readelf.h libmagic/readelf.h
2997 2976 typedef uint8_t Elf64_Char;
2998 2977 diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
2999 2978 --- libmagic.orig/softmagic.c 2013-03-21 18:45:14.000000000 +0100
3000   -+++ libmagic/softmagic.c 2013-04-01 18:12:28.709754199 +0200
  2979 ++++ libmagic/softmagic.c 2013-04-08 15:42:57.328298809 +0200
3001 2980 @@ -41,6 +41,11 @@
3002 2981 #include <stdlib.h>
3003 2982 #include <time.h>

0 comments on commit a35d386

Please sign in to comment.
Something went wrong with that request. Please try again.