aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util: using size_t len for byte utils

Browse Source 
Ticket: 4516

Like ByteExtractStringUint64, because most of their inputs come
from strlen which returns a size_t
pull/7242/head
Philippe Antoine 3 years ago committed by Victor Julien
parent f30975fb16
commit b1eaa1e8cd
2 changed files with 68 additions and 60 deletions
Show Stats Download Patch File Download Diff File

68
src/util-byte.c
Unescape Escape View File

@ -182,7 +182,7 @@ int ByteExtractUint16(uint16_t *res, int e, uint16_t len, const uint8_t *bytes)
return ret;
}
int ByteExtractString(uint64_t *res, int base, uint16_t len, const char *str, bool strict)
int ByteExtractString(uint64_t *res, int base, size_t len, const char *str, bool strict)
{
const char *ptr = str;
char *endptr = NULL;
@ -231,12 +231,12 @@ int ByteExtractString(uint64_t *res, int base, uint16_t len, const char *str, bo
return (endptr - ptr);
}
int ByteExtractStringUint64(uint64_t *res, int base, uint16_t len, const char *str)
int ByteExtractStringUint64(uint64_t *res, int base, size_t len, const char *str)
{
return ByteExtractString(res, base, len, str, false);
}
int ByteExtractStringUint32(uint32_t *res, int base, uint16_t len, const char *str)
int ByteExtractStringUint32(uint32_t *res, int base, size_t len, const char *str)
{
uint64_t i64;
@ -259,7 +259,7 @@ int ByteExtractStringUint32(uint32_t *res, int base, uint16_t len, const char *s
return ret;
}
int ByteExtractStringUint16(uint16_t *res, int base, uint16_t len, const char *str)
int ByteExtractStringUint16(uint16_t *res, int base, size_t len, const char *str)
{
uint64_t i64;
@ -282,7 +282,7 @@ int ByteExtractStringUint16(uint16_t *res, int base, uint16_t len, const char *s
return ret;
}
int ByteExtractStringUint8(uint8_t *res, int base, uint16_t len, const char *str)
int ByteExtractStringUint8(uint8_t *res, int base, size_t len, const char *str)
{
uint64_t i64;
@ -305,12 +305,12 @@ int ByteExtractStringUint8(uint8_t *res, int base, uint16_t len, const char *str
return ret;
}
int StringParseUint64(uint64_t *res, int base, uint16_t len, const char *str)
int StringParseUint64(uint64_t *res, int base, size_t len, const char *str)
{
return ByteExtractString(res, base, len, str, true);
}
int StringParseUint32(uint32_t *res, int base, uint16_t len, const char *str)
int StringParseUint32(uint32_t *res, int base, size_t len, const char *str)
{
uint64_t i64;
@ -333,7 +333,7 @@ int StringParseUint32(uint32_t *res, int base, uint16_t len, const char *str)
return ret;
}
int StringParseUint16(uint16_t *res, int base, uint16_t len, const char *str)
int StringParseUint16(uint16_t *res, int base, size_t len, const char *str)
{
uint64_t i64;
@ -356,7 +356,7 @@ int StringParseUint16(uint16_t *res, int base, uint16_t len, const char *str)
return ret;
}
int StringParseUint8(uint8_t *res, int base, uint16_t len, const char *str)
int StringParseUint8(uint8_t *res, int base, size_t len, const char *str)
{
uint64_t i64;
@ -379,8 +379,8 @@ int StringParseUint8(uint8_t *res, int base, uint16_t len, const char *str)
return ret;
}
int StringParseU64RangeCheck(uint64_t *res, int base, uint16_t len, const char *str,
uint64_t min, uint64_t max)
int StringParseU64RangeCheck(
uint64_t *res, int base, size_t len, const char *str, uint64_t min, uint64_t max)
{
uint64_t u64;
@ -398,8 +398,8 @@ int StringParseU64RangeCheck(uint64_t *res, int base, uint16_t len, const char *
return ret;
}
int StringParseU32RangeCheck(uint32_t *res, int base, uint16_t len, const char *str,
uint32_t min, uint32_t max)
int StringParseU32RangeCheck(
uint32_t *res, int base, size_t len, const char *str, uint32_t min, uint32_t max)
{
uint64_t u64;
@ -426,8 +426,8 @@ int StringParseU32RangeCheck(uint32_t *res, int base, uint16_t len, const char *
return ret;
}
int StringParseU16RangeCheck(uint16_t *res, int base, uint16_t len, const char *str,
uint16_t min, uint16_t max)
int StringParseU16RangeCheck(
uint16_t *res, int base, size_t len, const char *str, uint16_t min, uint16_t max)
{
uint64_t u64;
@ -454,8 +454,8 @@ int StringParseU16RangeCheck(uint16_t *res, int base, uint16_t len, const char *
return ret;
}
int StringParseU8RangeCheck(uint8_t *res, int base, uint16_t len, const char *str,
uint8_t min, uint8_t max)
int StringParseU8RangeCheck(
uint8_t *res, int base, size_t len, const char *str, uint8_t min, uint8_t max)
{
uint64_t u64;
@ -482,7 +482,7 @@ int StringParseU8RangeCheck(uint8_t *res, int base, uint16_t len, const char *st
return ret;
}
int ByteExtractStringSigned(int64_t *res, int base, uint16_t len, const char *str, bool strict)
int ByteExtractStringSigned(int64_t *res, int base, size_t len, const char *str, bool strict)
{
const char *ptr = str;
char *endptr;
@ -528,12 +528,12 @@ int ByteExtractStringSigned(int64_t *res, int base, uint16_t len, const char *st
return (endptr - ptr);
}
int ByteExtractStringInt64(int64_t *res, int base, uint16_t len, const char *str)
int ByteExtractStringInt64(int64_t *res, int base, size_t len, const char *str)
{
return ByteExtractStringSigned(res, base, len, str, false);
}
int ByteExtractStringInt32(int32_t *res, int base, uint16_t len, const char *str)
int ByteExtractStringInt32(int32_t *res, int base, size_t len, const char *str)
{
int64_t i64;
int ret;
@ -557,7 +557,7 @@ int ByteExtractStringInt32(int32_t *res, int base, uint16_t len, const char *str
return ret;
}
int ByteExtractStringInt16(int16_t *res, int base, uint16_t len, const char *str)
int ByteExtractStringInt16(int16_t *res, int base, size_t len, const char *str)
{
int64_t i64;
int ret;
@ -581,7 +581,7 @@ int ByteExtractStringInt16(int16_t *res, int base, uint16_t len, const char *str
return ret;
}
int ByteExtractStringInt8(int8_t *res, int base, uint16_t len, const char *str)
int ByteExtractStringInt8(int8_t *res, int base, size_t len, const char *str)
{
int64_t i64;
int ret;
@ -605,12 +605,12 @@ int ByteExtractStringInt8(int8_t *res, int base, uint16_t len, const char *str)
return ret;
}
int StringParseInt64(int64_t *res, int base, uint16_t len, const char *str)
int StringParseInt64(int64_t *res, int base, size_t len, const char *str)
{
return ByteExtractStringSigned(res, base, len, str, true);
}
int StringParseInt32(int32_t *res, int base, uint16_t len, const char *str)
int StringParseInt32(int32_t *res, int base, size_t len, const char *str)
{
int64_t i64;
int ret;
@ -634,7 +634,7 @@ int StringParseInt32(int32_t *res, int base, uint16_t len, const char *str)
return ret;
}
int StringParseInt16(int16_t *res, int base, uint16_t len, const char *str)
int StringParseInt16(int16_t *res, int base, size_t len, const char *str)
{
int64_t i64;
int ret;
@ -658,7 +658,7 @@ int StringParseInt16(int16_t *res, int base, uint16_t len, const char *str)
return ret;
}
int StringParseInt8(int8_t *res, int base, uint16_t len, const char *str)
int StringParseInt8(int8_t *res, int base, size_t len, const char *str)
{
int64_t i64;
int ret;
@ -682,8 +682,8 @@ int StringParseInt8(int8_t *res, int base, uint16_t len, const char *str)
return ret;
}
int StringParseI64RangeCheck(int64_t *res, int base, uint16_t len, const char *str,
int64_t min, int64_t max)
int StringParseI64RangeCheck(
int64_t *res, int base, size_t len, const char *str, int64_t min, int64_t max)
{
int64_t i64;
int ret;
@ -701,8 +701,8 @@ int StringParseI64RangeCheck(int64_t *res, int base, uint16_t len, const char *s
return ret;
}
int StringParseI32RangeCheck(int32_t *res, int base, uint16_t len, const char *str,
int32_t min, int32_t max)
int StringParseI32RangeCheck(
int32_t *res, int base, size_t len, const char *str, int32_t min, int32_t max)
{
int64_t i64;
int ret;
@ -730,8 +730,8 @@ int StringParseI32RangeCheck(int32_t *res, int base, uint16_t len, const char *s
return ret;
}
int StringParseI16RangeCheck(int16_t *res, int base, uint16_t len, const char *str,
int16_t min, int16_t max)
int StringParseI16RangeCheck(
int16_t *res, int base, size_t len, const char *str, int16_t min, int16_t max)
{
int64_t i64;
int ret;
@ -759,8 +759,8 @@ int StringParseI16RangeCheck(int16_t *res, int base, uint16_t len, const char *s
return ret;
}
int StringParseI8RangeCheck(int8_t *res, int base, uint16_t len, const char *str,
int8_t min, int8_t max)
int StringParseI8RangeCheck(
int8_t *res, int base, size_t len, const char *str, int8_t min, int8_t max)
{
int64_t i64;
int ret;

60
src/util-byte.h
Unescape Escape View File

@ -134,7 +134,7 @@ int ByteExtractUint16(uint16_t *res, int e, uint16_t len, const uint8_t *bytes);
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int ByteExtractString(uint64_t *res, int base, uint16_t len, const char *str, bool strict);
int ByteExtractString(uint64_t *res, int base, size_t len, const char *str, bool strict);
/**
* Extract unsigned integer value from a string as uint64_t.
@ -147,7 +147,7 @@ int ByteExtractString(uint64_t *res, int base, uint16_t len, const char *str, bo
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int ByteExtractStringUint64(uint64_t *res, int base, uint16_t len, const char *str);
int ByteExtractStringUint64(uint64_t *res, int base, size_t len, const char *str);
/**
* Extract unsigned integer value from a string as uint32_t.
@ -160,7 +160,7 @@ int ByteExtractStringUint64(uint64_t *res, int base, uint16_t len, const char *s
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int ByteExtractStringUint32(uint32_t *res, int base, uint16_t len, const char *str);
int ByteExtractStringUint32(uint32_t *res, int base, size_t len, const char *str);
/**
* Extract unsigned integer value from a string as uint16_t.
@ -173,7 +173,7 @@ int ByteExtractStringUint32(uint32_t *res, int base, uint16_t len, const char *s
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int ByteExtractStringUint16(uint16_t *res, int base, uint16_t len, const char *str);
int ByteExtractStringUint16(uint16_t *res, int base, size_t len, const char *str);
/**
* Extract unsigned integer value from a string as uint8_t.
@ -186,7 +186,7 @@ int ByteExtractStringUint16(uint16_t *res, int base, uint16_t len, const char *s
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int ByteExtractStringUint8(uint8_t *res, int base, uint16_t len, const char *str);
int ByteExtractStringUint8(uint8_t *res, int base, size_t len, const char *str);
/**
* Extract signed integer value from a string.
@ -200,7 +200,7 @@ int ByteExtractStringUint8(uint8_t *res, int base, uint16_t len, const char *str
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int ByteExtractStringSigned(int64_t *res, int base, uint16_t len, const char *str, bool strict);
int ByteExtractStringSigned(int64_t *res, int base, size_t len, const char *str, bool strict);
/**
* Extract signed integer value from a string as uint64_t.
@ -213,7 +213,7 @@ int ByteExtractStringSigned(int64_t *res, int base, uint16_t len, const char *st
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int ByteExtractStringInt64(int64_t *res, int base, uint16_t len, const char *str);
int ByteExtractStringInt64(int64_t *res, int base, size_t len, const char *str);
/**
* Extract signed integer value from a string as uint32_t.
@ -226,7 +226,7 @@ int ByteExtractStringInt64(int64_t *res, int base, uint16_t len, const char *str
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int ByteExtractStringInt32(int32_t *res, int base, uint16_t len, const char *str);
int ByteExtractStringInt32(int32_t *res, int base, size_t len, const char *str);
/**
* Extract signed integer value from a string as uint16_t.
@ -239,7 +239,7 @@ int ByteExtractStringInt32(int32_t *res, int base, uint16_t len, const char *str
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int ByteExtractStringInt16(int16_t *res, int base, uint16_t len, const char *str);
int ByteExtractStringInt16(int16_t *res, int base, size_t len, const char *str);
/**
* Extract signed integer value from a string as uint8_t.
@ -252,7 +252,7 @@ int ByteExtractStringInt16(int16_t *res, int base, uint16_t len, const char *str
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int ByteExtractStringInt8(int8_t *res, int base, uint16_t len, const char *str);
int ByteExtractStringInt8(int8_t *res, int base, size_t len, const char *str);
/**
* Extract unsigned integer value from a string as uint64_t strictly.
@ -265,7 +265,7 @@ int ByteExtractStringInt8(int8_t *res, int base, uint16_t len, const char *str);
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int StringParseUint64(uint64_t *res, int base, uint16_t len, const char *str);
int StringParseUint64(uint64_t *res, int base, size_t len, const char *str);
/**
* Extract unsigned integer value from a string as uint32_t strictly.
@ -278,7 +278,7 @@ int StringParseUint64(uint64_t *res, int base, uint16_t len, const char *str);
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int StringParseUint32(uint32_t *res, int base, uint16_t len, const char *str);
int StringParseUint32(uint32_t *res, int base, size_t len, const char *str);
/**
* Extract unsigned integer value from a string as uint16_t strictly.
@ -291,7 +291,7 @@ int StringParseUint32(uint32_t *res, int base, uint16_t len, const char *str);
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int StringParseUint16(uint16_t *res, int base, uint16_t len, const char *str);
int StringParseUint16(uint16_t *res, int base, size_t len, const char *str);
/**
* Extract unsigned integer value from a string as uint8_t strictly.
@ -304,7 +304,7 @@ int StringParseUint16(uint16_t *res, int base, uint16_t len, const char *str);
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int StringParseUint8(uint8_t *res, int base, uint16_t len, const char *str);
int StringParseUint8(uint8_t *res, int base, size_t len, const char *str);
/**
* Extract signed integer value from a string as int64_t strictly.
@ -317,7 +317,7 @@ int StringParseUint8(uint8_t *res, int base, uint16_t len, const char *str);
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int StringParseInt64(int64_t *res, int base, uint16_t len, const char *str);
int StringParseInt64(int64_t *res, int base, size_t len, const char *str);
/**
* Extract signed integer value from a string as int32_t strictly.
@ -330,7 +330,7 @@ int StringParseInt64(int64_t *res, int base, uint16_t len, const char *str);
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int StringParseInt32(int32_t *res, int base, uint16_t len, const char *str);
int StringParseInt32(int32_t *res, int base, size_t len, const char *str);
/**
* Extract signed integer value from a string as int16_t strictly.
@ -343,7 +343,7 @@ int StringParseInt32(int32_t *res, int base, uint16_t len, const char *str);
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int StringParseInt16(int16_t *res, int base, uint16_t len, const char *str);
int StringParseInt16(int16_t *res, int base, size_t len, const char *str);
/**
* Extract signed integer value from a string as int8_t strictly.
@ -356,7 +356,7 @@ int StringParseInt16(int16_t *res, int base, uint16_t len, const char *str);
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int StringParseInt8(int8_t *res, int base, uint16_t len, const char *str);
int StringParseInt8(int8_t *res, int base, size_t len, const char *str);
/**
* Extract unsigned integer value from a string as uint64_t strictly within the range.
@ -369,7 +369,8 @@ int StringParseInt8(int8_t *res, int base, uint16_t len, const char *str);
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int WARN_UNUSED StringParseU64RangeCheck(uint64_t *res, int base, uint16_t len, const char *str, uint64_t min, uint64_t max);
int WARN_UNUSED StringParseU64RangeCheck(
uint64_t *res, int base, size_t len, const char *str, uint64_t min, uint64_t max);
/**
* Extract unsigned integer value from a string as uint32_t strictly within the range.
@ -382,7 +383,8 @@ int WARN_UNUSED StringParseU64RangeCheck(uint64_t *res, int base, uint16_t len,
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int WARN_UNUSED StringParseU32RangeCheck(uint32_t *res, int base, uint16_t len, const char *str, uint32_t min, uint32_t max);
int WARN_UNUSED StringParseU32RangeCheck(
uint32_t *res, int base, size_t len, const char *str, uint32_t min, uint32_t max);
/**
* Extract unsigned integer value from a string as uint16_t strictly within the range.
@ -395,7 +397,8 @@ int WARN_UNUSED StringParseU32RangeCheck(uint32_t *res, int base, uint16_t len,
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int WARN_UNUSED StringParseU16RangeCheck(uint16_t *res, int base, uint16_t len, const char *str, uint16_t min, uint16_t max);
int WARN_UNUSED StringParseU16RangeCheck(
uint16_t *res, int base, size_t len, const char *str, uint16_t min, uint16_t max);
/**
* Extract unsigned integer value from a string as uint8_t strictly within the range.
@ -408,7 +411,8 @@ int WARN_UNUSED StringParseU16RangeCheck(uint16_t *res, int base, uint16_t len,
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int WARN_UNUSED StringParseU8RangeCheck(uint8_t *res, int base, uint16_t len, const char *str, uint8_t min, uint8_t max);
int WARN_UNUSED StringParseU8RangeCheck(
uint8_t *res, int base, size_t len, const char *str, uint8_t min, uint8_t max);
/**
* Extract signed integer value from a string as int64_t strictly within the range.
@ -421,7 +425,8 @@ int WARN_UNUSED StringParseU8RangeCheck(uint8_t *res, int base, uint16_t len, co
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int WARN_UNUSED StringParseI64RangeCheck(int64_t *res, int base, uint16_t len, const char *str, int64_t min, int64_t max);
int WARN_UNUSED StringParseI64RangeCheck(
int64_t *res, int base, size_t len, const char *str, int64_t min, int64_t max);
/**
* Extract signed integer value from a string as int32_t strictly within the range.
@ -434,7 +439,8 @@ int WARN_UNUSED StringParseI64RangeCheck(int64_t *res, int base, uint16_t len, c
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int WARN_UNUSED StringParseI32RangeCheck(int32_t *res, int base, uint16_t len, const char *str, int32_t min, int32_t max);
int WARN_UNUSED StringParseI32RangeCheck(
int32_t *res, int base, size_t len, const char *str, int32_t min, int32_t max);
/**
* Extract signed integer value from a string as int16_t strictly within the range.
@ -447,7 +453,8 @@ int WARN_UNUSED StringParseI32RangeCheck(int32_t *res, int base, uint16_t len, c
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int WARN_UNUSED StringParseI16RangeCheck(int16_t *res, int base, uint16_t len, const char *str, int16_t min, int16_t max);
int WARN_UNUSED StringParseI16RangeCheck(
int16_t *res, int base, size_t len, const char *str, int16_t min, int16_t max);
/**
* Extract signed integer value from a string as int8_t strictly within the range.
@ -460,7 +467,8 @@ int WARN_UNUSED StringParseI16RangeCheck(int16_t *res, int base, uint16_t len, c
* \return n Number of bytes extracted on success
* \return -1 On error
*/
int WARN_UNUSED StringParseI8RangeCheck(int8_t *res, int base, uint16_t len, const char *str, int8_t min, int8_t max);
int WARN_UNUSED StringParseI8RangeCheck(
int8_t *res, int base, size_t len, const char *str, int8_t min, int8_t max);
#ifdef UNITTESTS
void ByteRegisterTests(void);

Write Preview
Loading…
Cancel
Save