projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
novi upstream verzije 2.8.3
[ossec-hids.git]
/
src
/
os_regex
/
os_match_execute.c
diff --git
a/src/os_regex/os_match_execute.c
b/src/os_regex/os_match_execute.c
index
d61f0cb
..
0bc8377
100755
(executable)
--- a/
src/os_regex/os_match_execute.c
+++ b/
src/os_regex/os_match_execute.c
@@
-19,10
+19,13
@@
/** Internal matching **/
/** Internal matching **/
-int _OS_Match(char *pattern, char *str, int str_len, int size)
+int _OS_Match(const char *pattern, const char *str, size_t str_len, size_t size)
{
{
- int i = 0,j;
- char *pt = pattern;
+ size_t i = 0,j;
+ const char *pt = pattern;
+
+ if(str_len < size)
+ return(FALSE);
size = str_len - size;
size = str_len - size;
@@
-39,10
+42,10
@@
int _OS_Match(char *pattern, char *str, int str_len, int size)
{
if(str[j] == '\0')
return(FALSE);
{
if(str[j] == '\0')
return(FALSE);
-
+
else if(*pt != charmap[(uchar)str[j]])
{
else if(*pt != charmap[(uchar)str[j]])
{
- pt = pattern;
+ pt = pattern;
goto nnext;
}
j++;pt++;
goto nnext;
}
j++;pt++;
@@
-58,29
+61,30
@@
int _OS_Match(char *pattern, char *str, int str_len, int size)
/** Internal matching **/
/** Internal matching **/
-int _os_strncmp(char *pattern, char *str, int str_len, int size)
+int _os_strncmp(const char *pattern, const char *str, __attribute__((unused)) size_t str_len, size_t size)
{
if(strncasecmp(pattern, str, size) == 0)
return(TRUE);
{
if(strncasecmp(pattern, str, size) == 0)
return(TRUE);
-
- return(FALSE);
+
+ return(FALSE);
}
/** Internal matching **/
}
/** Internal matching **/
-int _os_strcmp(char *pattern, char *str, int str_len, int size)
+int _os_strcmp(const char *pattern, const char *str, __attribute__((unused)) size_t str_len, __attribute__((unused)) size_t size)
{
if(strcasecmp(pattern, str) == 0)
return(TRUE);
{
if(strcasecmp(pattern, str) == 0)
return(TRUE);
-
- return(FALSE);
+
+ return(FALSE);
}
}
-int _os_strmatch(char *pattern, char *str, int str_len, int size)
+int _os_strmatch(__attribute__((unused)) const char *pattern, __attribute__((unused)) const char *str,
+ __attribute__((unused)) size_t str_len, __attribute__((unused)) size_t size)
{
return(TRUE);
}
{
return(TRUE);
}
-int _os_strstr(char *pattern, char *str, int str_len, int size)
+int _os_strstr(const char *pattern, const char *str, __attribute__((unused)) size_t str_len, __attribute__((unused)) size_t size)
{
if(strstr(str, pattern) != NULL)
{
{
if(strstr(str, pattern) != NULL)
{
@@
-91,16
+95,16
@@
int _os_strstr(char *pattern, char *str, int str_len, int size)
/** Internal matching **/
/** Internal matching **/
-int _os_strcmp_last(char *pattern, char *str, int str_len, int size)
+int _os_strcmp_last(const char *pattern, const char *str, size_t str_len, size_t size)
{
/* Size of the string must be bigger */
{
/* Size of the string must be bigger */
- if((str_len - size) < 0)
+ if(str_len < size)
return(FALSE);
return(FALSE);
-
+
if(strcasecmp(pattern, str + (str_len - size)) == 0)
return(TRUE);
if(strcasecmp(pattern, str + (str_len - size)) == 0)
return(TRUE);
-
- return(FALSE);
+
+ return(FALSE);
}
}
@@
-110,10
+114,10
@@
int _os_strcmp_last(char *pattern, char *str, int str_len, int size)
* Returns 1 on success or 0 on error.
* The error code is set on reg->error.
*/
* Returns 1 on success or 0 on error.
* The error code is set on reg->error.
*/
-int OSMatch_Execute(char *str, int str_len, OSMatch *reg)
+int OSMatch_Execute(const char *str, size_t str_len, OSMatch *reg)
{
short int i = 0;
{
short int i = 0;
-
+
/* The string can't be NULL */
if(str == NULL)
{
/* The string can't be NULL */
if(str == NULL)
{
@@
-125,9
+129,9
@@
int OSMatch_Execute(char *str, int str_len, OSMatch *reg)
/* Looping on all sub patterns */
while(reg->patterns[i])
{
/* Looping on all sub patterns */
while(reg->patterns[i])
{
- if(reg->match_fp[i](reg->patterns[i],
- str,
- str_len,
+ if(reg->match_fp[i](reg->patterns[i],
+ str,
+ str_len,
reg->size[i]) == TRUE)
{
return(1);
reg->size[i]) == TRUE)
{
return(1);
@@
-136,7
+140,7
@@
int OSMatch_Execute(char *str, int str_len, OSMatch *reg)
}
return(0);
}
return(0);
-}
+}
/* EOF */
/* EOF */