Reset Config.GdbServer if GDB server init fails

gdbstub/gdbstub_sys.c

@@ -259,7 +259,7 @@ static int wait_ack(struct msg *msg)
     } while (ret < 0 && errno == EAGAIN);
 
     if (msg->type != MSG_TYPE_ACK) {
-        fprintf(stderr, "unexpected msg.type %d\n", msg->type);
+        fprintf(stderr, "wait_ack: unexpected msg.type %d\n", msg->type);
         return 1;
     }
 
@@ -367,9 +367,7 @@ static void stop_thread(void)
 #ifdef _POSIX_VERSION
 void gdbstub_sys_recv(struct msg *msg)
 {
-    while (out_queue < 0)
-        ;
-
+    if (out_queue >= 0)
     {
         const ssize_t sz = mq_receive(out_queue, (char *)msg, sizeof *msg, 0);
 
@@ -406,7 +404,7 @@ void dbg_stop(void)
 
 void dbg_start(void)
 {
-    if (server_socket > 0) {
+    if (server_socket >= 0) {
         fprintf(stderr, "gdb server already started\n");
         return;
     }
@@ -415,14 +413,18 @@ void dbg_start(void)
 
         server_socket = StartServer(port);
 
-        if (server_socket > 0) {
+        if (server_socket >= 0) {
             printf("GDB server started on port %hu.\n", port);
-            if (queue_create())
+            if (queue_create()) {
                 fprintf(stderr, "could not create gdb stub internal queues\n");
+                Config.GdbServer = 0;
+            }
             else
                 start_thread();
         }
-        else
+        else {
             fprintf(stderr, "could not start GDB server\n");
+            Config.GdbServer = 0;
+        }
     }
 }

libpcsxcore/socket.c

@@ -180,7 +180,7 @@ static enum read_socket_err ReadSocketOS(int client_socket, char *buf, size_t *c
 enum read_socket_err ReadSocket(int client_socket, char *buf, size_t *const len) {
     char * endl;
 
-    if (!client_socket || !buf || !len || !*len)
+    if (client_socket < 0 || !buf || !len || !*len)
         return READ_SOCKET_ERR_INVALID_ARG;
 
     return ReadSocketOS(client_socket, buf, len);