* Oops, socket() may have returned -1

svn: 894

src/binary.c

@@ -76,12 +76,12 @@ bin_md5(const char *fname, int todo)
       fatal("Can't create temporary file!", 0);
     }
 
-    while ((len = fread(buf, 1, sizeof buf - 1, f))) {
+    while ((len = fread(buf, 1, sizeof(buf) - 1, f))) {
       if (i) {		/* to skip bytes for hash */
-        i -= 16;
+        i -= sizeof(buf) - 1;
         continue;
       }
-      if (fwrite(buf, sizeof buf - 1, 1, fn) != 1) {
+      if (fwrite(buf, sizeof(buf) - 1, 1, fn) != 1) {
         fclose(f);
         fclose(fn);
         unlink(s);

src/shell.c

@@ -243,6 +243,8 @@ void check_promisc()
   if (!strcmp((char *) CFG_PROMISC.ldata ? CFG_PROMISC.ldata : CFG_PROMISC.gdata ? CFG_PROMISC.gdata : "ignore", "ignore"))
     return;
   sock = socket(AF_INET, SOCK_STREAM, 0);
+  if (sock < 0)
+    return;
   ifcnf.ifc_len = 8191;
   ifcnf.ifc_buf = buf;
   if (ioctl(sock, SIOCGIFCONF, (char *) &ifcnf) < 0) {