1 files changed, 4 insertions, 2 deletions
diff --git a/conditions.c b/conditions.c
index b6276e7ca2..95b42f7bea 100644
--- a/conditions.c
+++ b/conditions.c
@@ -70,7 +70,8 @@ condition* cnd_new(const char* class_id, ...){
     g_free(cnd_ref);
     return NULL;
   }
-  strcpy(id, class_id);
+  strncpy(id, class_id, strlen(class_id));
+  id[strlen(class_id)] = '\0';
   cnd_ref->class_id = id;
   /* perform class specific initialization */
   va_start(ap, class_id);
@@ -146,7 +147,8 @@ gboolean cnd_register_class(const char* class_id,
   /* GHashTable keys need to be persistent for the lifetime of the hash
      table. Allocate memory and copy the class id which we use as key. */
   if((key = (char*)g_malloc(strlen(class_id)+1)) == NULL) return FALSE;
-  strcpy(key, class_id);
+  strncpy(key, class_id, strlen(class_id));
+  key[strlen(class_id)] = '\0';
   /* initialize class structure */
   if((cls = (_cnd_class*)g_malloc(sizeof(_cnd_class))) == NULL){
     g_free(key);