Changeset 8298425 for message.c

Timestamp:

Dec 30, 2004, 3:38:59 PM (19 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

74037d9

Parents:

fe39450

Message:

Don't crash on super-long hostnames
Improved test for finding libdes425

File:

• message.c (modified) (6 diffs)

message.c

@@ -19 +19 @@
   owl_message_set_direction_none(m);
   m->delete=0;
-  strcpy(m->hostname, "");
+  m->hostname=owl_strdup("");
   m->zwriteline=strdup("");
   m->invalid_format=1;
@@ -463 +463 @@
 }
 #endif
+
+void owl_message_set_hostname(owl_message *m, char *hostname)
+{
+  if (m==NULL) return;
+  if (m->hostname!=NULL) {
+    owl_free(m->hostname);
+  }
+  m->hostname=owl_strdup(hostname);
+}
 
 char *owl_message_get_hostname(owl_message *m)
@@ -815 +824 @@
   hent=gethostbyaddr((char *) &(n->z_uid.zuid_addr), sizeof(n->z_uid.zuid_addr), AF_INET);
   if (hent && hent->h_name) {
-    strcpy(m->hostname, hent->h_name);
+    owl_message_set_hostname(m, hent->h_name);
   } else {
-    strcpy(m->hostname, inet_ntoa(n->z_sender_addr));
+    owl_message_set_hostname(m, inet_ntoa(n->z_sender_addr));
   }
 }
@@ -870 +879 @@
   /* save the hostname */
   owl_function_debugmsg("create_pseudo_login: host is %s", host ? host : "");
-  strcpy(m->hostname, host ? host : "");
+  owl_message_set_hostname(m, host ? host : "");
   owl_free(longuser);
 }
@@ -878 +887 @@
   owl_zwrite z;
   int ret;
+  char hostbuff[5000];
   
   owl_message_init(m);
@@ -901 +911 @@
   
   /* save the hostname */
-  ret=gethostname(m->hostname, MAXHOSTNAMELEN);
+  ret=gethostname(hostbuff, MAXHOSTNAMELEN);
+  hostbuff[MAXHOSTNAMELEN]='\0';
   if (ret) {
-    strcpy(m->hostname, "localhost");
-  }
-
+    owl_message_set_hostname(m, "localhost");
+  } else {
+    owl_message_set_hostname(m, hostbuff);
+  }
   owl_zwrite_free(&z);
 }