@@ -1702,7 +1702,7 @@ diff -ur libmagic.orig/encoding.c libmagic/encoding.c
1702
1702
return 0;
1703
1703
diff -ur libmagic.orig/file.h libmagic/file.h
1704
1704
--- libmagic.orig/file.h 2020-06-15 02:01:01.000000000 +0200
1705
- +++ libmagic/file.h 2020-08-29 11:56:12.303522747 +0200
1705
+ +++ libmagic/file.h 2020-09-02 17:35:51.709611515 +0200
1706
1706
@@ -33,17 +33,13 @@
1707
1707
#ifndef __file_h__
1708
1708
#define __file_h__
@@ -1900,7 +1900,7 @@ diff -ur libmagic.orig/file.h libmagic/file.h
1900
1900
- int);
1901
1901
- protected void file_regfree(file_regex_t *);
1902
1902
- protected void file_regerror(file_regex_t *, int, struct magic_set *);
1903
- + public zend_string* convert_libmagic_pattern(char *val, size_t len, uint32_t options);
1903
+ + public zend_string* convert_libmagic_pattern(const char *val, size_t len, uint32_t options);
1904
1904
1905
1905
typedef struct {
1906
1906
char *buf;
@@ -3333,7 +3333,7 @@ diff -ur libmagic.orig/readcdf.c libmagic/readcdf.c
3333
3333
if (i != -1)
3334
3334
diff -ur libmagic.orig/softmagic.c libmagic/softmagic.c
3335
3335
--- libmagic.orig/softmagic.c 2020-06-15 02:01:01.000000000 +0200
3336
- +++ libmagic/softmagic.c 2020-08-29 11:56:13.219516523 +0200
3336
+ +++ libmagic/softmagic.c 2020-09-02 20:04:00.794667114 +0200
3337
3337
@@ -43,6 +43,10 @@
3338
3338
#include <time.h>
3339
3339
#include "der.h"
@@ -3495,7 +3495,7 @@ diff -ur libmagic.orig/softmagic.c libmagic/softmagic.c
3495
3495
return file_strncmp(a, b, len, maxlen, flags);
3496
3496
}
3497
3497
3498
- + public zend_string* convert_libmagic_pattern(char *val, size_t len, uint32_t options)
3498
+ + public zend_string* convert_libmagic_pattern(const char *val, size_t len, uint32_t options)
3499
3499
+ {
3500
3500
+ int i, j;
3501
3501
+ zend_string *t;
0 commit comments