stest/udp-preload.c: Fix error handling of sun_prep

[secnet.git] / stest / udp-preload.c

diff --git a/stest/udp-preload.c b/stest/udp-preload.c
index f2e2b7923be7d267cb2ff4938cf0b42a1afcd804..1f3e7e3921a26a1717b56e770352078c87cbd68d 100644 (file)
--- a/stest/udp-preload.c
+++ b/stest/udp-preload.c
@@ -74,7 +74,6 @@ static anyfn_type *find_any(const char *name) {
 
 #define DEF_OLD(fn,rt,args)                            \
   typedef rt fn##_fn_type(fn##_args);                  \
-  static rt find_##fn(fn##_args);                      \
   static fn##_fn_type find_##fn, *old_##fn=find_##fn;  \
   static rt find_##fn(fn##_args) {                     \
     anyfn_type *anyfn;                                 \
@@ -171,7 +170,7 @@ static char *sun_prep(struct sockaddr_un *sun) {
 
     memset(sun,0,sizeof(*sun));
     sun->sun_family=AF_UNIX;
-    int dl = strlen(dir);
+    size_t dl = strlen(dir);
     if (dl + 1 + ADDRPORTSTRLEN + 1 > sizeof(sun->sun_path)) {
        errno=ENAMETOOLONG; return 0;
     }
@@ -217,6 +216,7 @@ WRAP(bind) {
     if (!ent) return old_bind(fd,addr,addrlen);
     struct sockaddr_un sun;
     char *p=sun_prep(&sun);
+    if (!p) return -1;
     if (addrport2str(p,addr,addrlen)) return -1;
 //fprintf(stderr,"binding %s\n",sun.sun_path);
     if (unlink(sun.sun_path) && errno!=ENOENT) return -1;
@@ -263,6 +263,7 @@ ssize_t TWRAP(sendto) {
     if (strlen(leaf) > ADDRPORTSTRLEN) { errno=ENAMETOOLONG; return -1; }
     struct sockaddr_un sun;
     char *p=sun_prep(&sun);
+    if (!p) return -1;
     strcpy(p,leaf);
 
     char tbuf[ADDRPORTSTRLEN+1];
@@ -309,7 +310,7 @@ ssize_t TWRAP(recvfrom) {
 
     ssize_t rr=recvmsg(fd,&m,0);
     if (rr==-1) return rr;
-    if (rr<sizeof(tbuf)) { errno=ENXIO; return -1; }
+    if ((size_t)rr<sizeof(tbuf)) { errno=ENXIO; return -1; }
     if (tbuf[ADDRPORTSTRLEN]) { errno=E2BIG; return -1; }
     if (str2addrport(tbuf,addr,addrlen)) {
        fprintf(stderr, "recvfrom str2addrport `%s' %s\n",tbuf,