Convert bitfields to integers in a safe way.

[tinc] / lib / utils.c

diff --git a/lib/utils.c b/lib/utils.c
index 43abf96..02b7b34 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1,7 +1,7 @@
 /*
     utils.c -- gathering of some stupid small functions
-    Copyright (C) 1999-2003 Ivo Timmermans <zarq@iname.com>
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans <zarq@iname.com>
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ volatile char (*cp_file[]) = {"?", "?", "?", "?", "?", "?", "?", "?", "?", "?",
 volatile int cp_index = 0;
 #endif
 
-char *hexadecimals = "0123456789ABCDEF";
+const char hexadecimals[] = "0123456789ABCDEF";
 
 int charhex2bin(char c)
 {
@@ -85,15 +85,25 @@ void cp_trace()
 #include <w32api/windows.h>
 #endif
 
-char *winerror(int err) {
-       static char buf[1024];
+const char *winerror(int err) {
+       static char buf[1024], *newline;
 
        if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
                NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, sizeof(buf), NULL)) {
                strncpy(buf, _("(unable to format errormessage)"), sizeof(buf));
        };
 
+       if((newline = strchr(buf, '\r')))
+               *newline = '\0';
+
        return buf;
 }
 #endif
 
+unsigned int bitfield_to_int(void *bitfield, size_t size) {
+       unsigned int value = 0;
+       if(size > sizeof value)
+               size = sizeof value;
+       memcpy(&value, bitfield, size);
+       return value;
+}