Add more error checks to handle_service_request().

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@438 7dcaeef0-15fb-0310-b436-a5af3365683c

libssh/messages.c

@@ -59,25 +59,44 @@ static SSH_MESSAGE *message_new(SSH_SESSION *session){
 }
 
 static int handle_service_request(SSH_SESSION *session) {
-    STRING *service;
+  STRING *service = NULL;
-    char *service_c;
+  char *service_c = NULL;
+  int rc = -1;
+
   enter_function();
+
   service = buffer_get_ssh_string(session->in_buffer);
-    if(!service){
+  if (service == NULL) {
     ssh_set_error(session, SSH_FATAL, "Invalid SSH_MSG_SERVICE_REQUEST packet");
     leave_function();
     return -1;
   }
+
   service_c = string_to_char(service);
+  if (service_c == NULL) {
+    goto error;
+  }
+
   ssh_log(session, SSH_LOG_PACKET,
       "Sending a SERVICE_ACCEPT for service %s", service_c);
-    free(service_c);
+  SAFE_FREE(service_c);
-    buffer_add_u8(session->out_buffer,SSH2_MSG_SERVICE_ACCEPT);
+
-    buffer_add_ssh_string(session->out_buffer,service);
+  if (buffer_add_u8(session->out_buffer, SSH2_MSG_SERVICE_ACCEPT) < 0) {
-    packet_send(session);
+    goto error;
-    free(service);
+  }
+  if (buffer_add_ssh_string(session->out_buffer, service) < 0) {
+    goto error;
+  }
+  if (packet_send(session) != SSH_OK) {
+    goto error;
+  }
+
+  rc = 0;
+error:
+  string_free(service);
   leave_function();
-    return 0;
+
+  return rc;
 }
 
 static void handle_unimplemented(SSH_SESSION *session){