Prevents crash from why3 server

src/server/request.c

@@ -129,22 +129,43 @@ prequest parse_request(char* str_req, int len, int key) {
 
 void print_request(prequest r) {
   if (r) {
-    printf("%s %d %d %s", r->id, r->timeout, r->memlimit, r->cmd);
-    for (int i = 0; i < r->numargs; i++) {
-       printf(" %s", r->args[i]);
+    switch (r->req_type) {
+    case REQ_RUN:
+      printf("req_type=REQ_RUN, timeout=%d, memlimit=%d, cmd=%s", r->timeout, r->memlimit, r->cmd);
+      for (int i = 0; i < r->numargs; i++) {
+        printf(" %s", r->args[i]);
+      }
+      break;
+    case REQ_INTERRUPT:
+      printf("req_type=REQ_INTERRUPT, id=%s", r->id);
+      break;
+    default:
+      printf("request.print_request: ill-formed request");
     }
-  } else {
-    printf("<null>");
+  }
+  else {
+    printf("<null request>");
   }
 }
 
 void free_request(prequest r) {
-  free(r->cmd);
-  for (int i = 0;i < r->numargs; i++) {
-    free(r->args[i]);
+  if (r) {
+    switch (r->req_type) {
+    case REQ_RUN:
+      free(r->cmd);
+      for (int i = 0;i < r->numargs; i++) {
+        free(r->args[i]);
+      }
+      free(r->args);
+      break;
+    case REQ_INTERRUPT:
+      free(r->id);
+      break;
+    default:
+        log_msg("bad argument for request.free_request()");
+    }
+    free(r);
   }
-  free(r->args);
-  free(r);
 }
 
 void init_request_queue () {

src/server/request.h

@@ -37,7 +37,7 @@ prequest parse_request(char* str_req, int len, int key);
 //debug code
 void print_request(prequest r);
 
-//does *not* free the id of the request
+// free a request
 void free_request(prequest r);
 
 // Global queue to contain queued requests