aboutsummaryrefslogtreecommitdiffstats
path: root/src/libstddjb
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2025-04-23 19:44:23 +0000
committerLaurent Bercot <ska@appnovation.com>2025-04-23 19:44:23 +0000
commit6348137adc2e0d2914339e760dbde1814d44b109 (patch)
tree28aa3663d871f37d38e4d0c41fbcd7d9f60a8bc6 /src/libstddjb
parent4a4fdf3685a6ebdd9f0ef68896536ba26392c538 (diff)
downloadskalibs-6348137adc2e0d2914339e760dbde1814d44b109.tar.gz
Add rpath; fix excessive ip4_scan tolerance
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/libstddjb')
-rw-r--r--src/libstddjb/ip4_scan.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/libstddjb/ip4_scan.c b/src/libstddjb/ip4_scan.c
index 19c2cec..fe4a8b6 100644
--- a/src/libstddjb/ip4_scan.c
+++ b/src/libstddjb/ip4_scan.c
@@ -1,24 +1,22 @@
/* ISC license. */
-#include <skalibs/types.h>
+#include <stdint.h>
+
+#include <skalibs/uint16.h>
#include <skalibs/fmtscan.h>
size_t ip4_scan (char const *s, char *ip)
{
size_t len = 0 ;
- unsigned int j = 0 ;
- for (; j < 4 ; j++)
+ uint16_t u ;
+ for (unsigned int j = 0 ; j < 4 ; j++)
{
- unsigned int u ;
- size_t i = uint_scan(s, &u) ;
- if (!i) return 0 ;
- ip[j] = (char)u ;
- s += i ;
+ size_t i = uint16_scan(s + len, &u) ;
+ if (!i || u > 0xffu) return 0 ;
+ ip[j] = u ;
len += i ;
if (j == 3) break ;
- if (*s != '.') return 0 ;
- ++s ;
- ++len ;
+ if (s[len++] != '.') return 0 ;
}
return len ;
}