Merge pull request #76 from nadenislamarre/fixevdevarrays

evdev: add array allocation checks on snprintf and for loops

.github/workflows/main.yml

@@ -35,14 +35,19 @@ jobs:
       - name: Display Downloaded Artifacts
         run: find ./artifacts/
 
+      - name: Add 161 to github.run_number
+        run: |
+          NEW_RUN_NUMBER=$(( ${{ github.run_number }} + 161 ))
+          echo "NEW_RUN_NUMBER=$NEW_RUN_NUMBER" >> $GITHUB_ENV
+
       - name: Create Preview Release
         if: github.ref == 'refs/heads/master'
         uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: v${{ github.run_number }}
+          automatic_release_tag: v${{ env.NEW_RUN_NUMBER }}
           prerelease: false
-          title: "Build v${{ github.run_number }}"
+          title: "Build v${{ env.NEW_RUN_NUMBER }}"
           files: |
             ./artifacts/linux-flatpak/lindbergh-loader.flatpak
             ./artifacts/linux-build/build.tar.gz

docs/changelog

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.0.5]
+### Fixed
+    - Fixed LGJ, VT3 and ID4/ID5 JVS passthrough.
+    
 ## [2.0.4] 
 ### Added
     - Boost render res option for Rambo, LGJ, HOD4, HOD-EX, ID4/ID5, 2Spicy and Harley.

docs/guide.md

@@ -90,6 +90,10 @@ sudo ln -s /lib/i386-linux-gnu/libglut.so /lib/i386-linux-gnu/libglut.so.3
 
 - You need to set `SKIP_OUTRUN_CABINET_CHECK` to 1 in `lindbergh.conf` to play in DX, SDX or Standard cabinet types.
 
+### Hummer (all versions)
+
+The games will ask for libGLcore.so.1 and libnvidia-tls.so.1 you can copy for example libkswapapi.so as libGLcore.so.1 and libnvidia-tls.so.1 and the game will work fine.
+
 ## Configuration File : lindbergh.conf
 
 All configurable options are set and explained in the [`lindbergh.conf`](lindbergh.conf) file itself, and should be reasonably easy to understand. This chapter further explains some of those setup options.

src/lindbergh/evdevinput.c

@@ -862,7 +862,7 @@ static ControllerStatus listControllers(Controllers *controllers)
         int controller = open(controllers->controller[i].path, O_RDONLY);
         if (controller < 0)
         {
-            strcpy(controllers->controller[i].name, "Unknown");
+            strncpy(controllers->controller[i].name, "Unknown", SIZE);
             continue;
         }
 
@@ -912,21 +912,26 @@ static ControllerStatus listControllers(Controllers *controllers)
             {
                 if (test_bit(code, bit[EV_KEY]))
                 {
+                    if(controllers->controller[i].inputCount >= MAX_INPUTS) { // the number of input is limited
+		      fprintf(stderr, "warning, maximum number of inputs reached !\n");
+		      break;
+                    }
+
                     controllers->controller[i].enabled = 1;
                     ControllerInput *controllerInput =
                         &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
                     controllerInput->evType = EV_KEY;
                     controllerInput->evCode = code;
                     controllerInput->specialFunction = NO_SPECIAL_FUNCTION;
-                    strcpy(controllerInput->inputName, controllers->controller[i].name);
+                    strncpy(controllerInput->inputName, controllers->controller[i].name, SIZE);
                     strcat(controllerInput->inputName, "_");
                     strcat(controllerInput->inputName, codename(EV_KEY, code));
                     normaliseName(controllerInput->inputName);
-                    //                    if(snprintf(controllerInput->inputTechName, SIZE, "%s:KEY:%i", controllers->controller[i].path,
+                    if (snprintf(controllerInput->inputTechName, SIZE, "%s:KEY:%i", controllers->controller[i].path, code) >= 1024)
-                    //                    code) >= 1024) {
+                    {
-                    //                      // hum ok, truncated value
+                        // hum ok, truncated value
-                    //                    }
+                    }
-                    //		    strcpy(controllerInput->inputTechNegName, "-"); // unassignable value (not "" while some conf are empty)
+                    strncpy(controllerInput->inputTechNegName, "-", SIZE); // unassignable value (not "" while some conf are empty)
                 }
             }
         }
@@ -944,67 +949,70 @@ static ControllerStatus listControllers(Controllers *controllers)
                     controllerInput->evType = EV_ABS;
                     controllerInput->evCode = code;
                     controllerInput->specialFunction = NO_SPECIAL_FUNCTION;
-                    strcpy(controllerInput->inputName, controllers->controller[i].name);
+                    strncpy(controllerInput->inputName, controllers->controller[i].name, SIZE);
                     strcat(controllerInput->inputName, "_");
                     strcat(controllerInput->inputName, codename(EV_ABS, code));
                     normaliseName(controllerInput->inputName);
-                    //                    if(snprintf(controllerInput->inputTechName, SIZE, "%s:ABS:%i", controllers->controller[i].path,
+                    if (snprintf(controllerInput->inputTechName, SIZE, "%s:ABS:%i", controllers->controller[i].path, code) >= 1024)
-                    //                    code) >= 1024) {
+                    {
-                    //                      // hum ok, truncated value
+                        // hum ok, truncated value
-                    //                    }
+                    }
-                    //                    if(snprintf(controllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i",
+                    if (snprintf(controllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i", controllers->controller[i].path, code) >= 1024)
-                    //                    controllers->controller[i].path, code) >= 1024) {
+                    {
-                    //                      // hum ok, truncated value
+                        // hum ok, truncated value
-                    //                    }
+                    }
 
                     ControllerInput *minControllerInput =
                         &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
                     minControllerInput->evType = EV_ABS;
                     minControllerInput->evCode = code;
                     minControllerInput->specialFunction = ANALOGUE_TO_DIGITAL_MIN;
-                    strcpy(minControllerInput->inputName, controllerInput->inputName);
+                    strncpy(minControllerInput->inputName, controllerInput->inputName, SIZE);
                     strcat(minControllerInput->inputName, "_MIN");
-                    //                    if(snprintf(minControllerInput->inputTechName, SIZE, "%s:ABS:%i:MIN",
+                    if (snprintf(minControllerInput->inputTechName, SIZE, "%s:ABS:%i:MIN", controllers->controller[i].path, code) >= 1024)
-                    //                    controllers->controller[i].path, code) >= 1024) {
+                    {
-                    //                      // hum ok, truncated value
+                        // hum ok, truncated value
-                    //                    }
+                    }
-                    //                    if(snprintf(minControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MIN",
+                    if (snprintf(minControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MIN", controllers->controller[i].path, code) >=
-                    //                    controllers->controller[i].path, code) >= 1024) {
+                        1024)
-                    //                      // hum ok, truncated value
+                    {
-                    //                    }
+                        // hum ok, truncated value
+                    }
 
                     ControllerInput *maxControllerInput =
                         &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
                     maxControllerInput->evType = EV_ABS;
                     maxControllerInput->evCode = code;
                     maxControllerInput->specialFunction = ANALOGUE_TO_DIGITAL_MAX;
-                    strcpy(maxControllerInput->inputName, controllerInput->inputName);
+                    strncpy(maxControllerInput->inputName, controllerInput->inputName, SIZE);
                     strcat(maxControllerInput->inputName, "_MAX");
-                    //                    if(snprintf(maxControllerInput->inputTechName, SIZE, "%s:ABS:%i:MAX",
+                    if (snprintf(maxControllerInput->inputTechName, SIZE, "%s:ABS:%i:MAX", controllers->controller[i].path, code) >= 1024)
-                    //                    controllers->controller[i].path, code) >= 1024) {
+                    {
-                    //                      // hum ok, truncated value
+                        // hum ok, truncated value
-                    //                    }
+                    }
-                    //                    if(snprintf(maxControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MAX",
+                    if (snprintf(maxControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MAX", controllers->controller[i].path, code) >=
-                    //                    controllers->controller[i].path, code) >= 1024) {
+                        1024)
-                    //                      // hum ok, truncated value
+                    {
-                    //                    }
+                        // hum ok, truncated value
+                    }
+
+                    ControllerInput *shakeControllerInput = &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
+                    shakeControllerInput->evType = EV_ABS;
+                    shakeControllerInput->evCode = code;
+                    shakeControllerInput->specialFunction = ANALOGUE_SHAKE;
+                    strncpy(shakeControllerInput->inputName, controllerInput->inputName, SIZE);
+                    strcat(shakeControllerInput->inputName, "_SHAKE");
+                    if (snprintf(shakeControllerInput->inputTechName, SIZE, "%s:ABS:%i:SHAKE", controllers->controller[i].path, code) >=
+                        1024)
+                    {
+                        // hum ok, truncated value
+                    }
 
-                    //		    ControllerInput *shakeControllerInput =
-                    //		      &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
-                    //                    shakeControllerInput->evType = EV_ABS;
-                    //                    shakeControllerInput->evCode = code;
-                    //                    shakeControllerInput->specialFunction = ANALOGUE_SHAKE;
-                    //                    strcpy(shakeControllerInput->inputName, controllerInput->inputName);
-                    //                    strcat(shakeControllerInput->inputName, "_SHAKE");
-                    //                    if(snprintf(shakeControllerInput->inputTechName, SIZE, "%s:ABS:%i:SHAKE",
-                    //                    controllers->controller[i].path, code) >= 1024) {
-                    //                      // hum ok, truncated value
-                    //                    }
-                    //
                     struct input_absinfo absoluteFeatures;
                     ioctl(controller, EVIOCGABS(code), &absoluteFeatures);
                     controllers->controller[i].absMin[code] = absoluteFeatures.minimum;
                     controllers->controller[i].absMax[code] = absoluteFeatures.maximum;
+
                 }
             }
         }
@@ -1292,7 +1300,7 @@ ControllerStatus getArcadeInputByName(char *name, ArcadeInput *input)
     {
         if (strcmp(tempName, name) == 0)
         {
-            strcpy(input->name, arcadeInputs[index].name);
+            strncpy(input->name, arcadeInputs[index].name, SIZE);
             input->channel = arcadeInputs[index].channel;
             input->player = arcadeInputs[index].player;
             return CONTROLLER_STATUS_SUCCESS;
@@ -1369,8 +1377,8 @@ ControllerStatus startControllerThreads(Controllers *controllers)
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].enabled = 1;
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].channel =
                         input.channel;
-                    strcpy(controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].name,
+                    strncpy(controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].name,
-                           input.name);
+			    input.name, SIZE);
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].player =
                         input.player;
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].isNeg = negabs;
@@ -1384,8 +1392,8 @@ ControllerStatus startControllerThreads(Controllers *controllers)
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].maxEnabled = 1;
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].maxChannel =
                         input.channel;
-                    strcpy(controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].maxName,
+                    strncpy(controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].maxName,
-                           input.name);
+			    input.name, SIZE);
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].maxPlayer =
                         input.player;
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].isNeg = negabs;
@@ -1399,8 +1407,8 @@ ControllerStatus startControllerThreads(Controllers *controllers)
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].minEnabled = 1;
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].minChannel =
                         input.channel;
-                    strcpy(controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].minName,
+                    strncpy(controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].minName,
-                           input.name);
+			    input.name, SIZE);
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].minPlayer =
                         input.player;
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].isNeg = negabs;
@@ -1414,8 +1422,8 @@ ControllerStatus startControllerThreads(Controllers *controllers)
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].shakeEnabled = 1;
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].shakeChannel =
                         input.channel;
-                    strcpy(controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].shakeName,
+                    strncpy(controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].shakeName,
-                           input.name);
+			    input.name, SIZE);
                     controllers->controller[i].absTriggers[controllers->controller[i].inputs[j].evCode].shakePlayer =
                         input.player;
                 }
@@ -1432,8 +1440,8 @@ ControllerStatus startControllerThreads(Controllers *controllers)
                 controllers->controller[i].keyTriggers[controllers->controller[i].inputs[j].evCode].enabled = 1;
                 controllers->controller[i].keyTriggers[controllers->controller[i].inputs[j].evCode].channel =
                     input.channel;
-                strcpy(controllers->controller[i].keyTriggers[controllers->controller[i].inputs[j].evCode].name,
+                strncpy(controllers->controller[i].keyTriggers[controllers->controller[i].inputs[j].evCode].name,
-                       input.name);
+			input.name, SIZE);
                 controllers->controller[i].keyTriggers[controllers->controller[i].inputs[j].evCode].player =
                     input.player;
 

src/lindbergh/evdevinput.h

@@ -2,9 +2,9 @@
 
 #include <linux/input-event-codes.h>
 
-#define SIZE 128
+#define SIZE 300
 #define CONTROLLER_THREAD_MAX 256
-
+#define MAX_INPUTS 512
 
 typedef struct
 {
@@ -69,12 +69,12 @@ typedef struct
 typedef struct
 {
     char name[SIZE];
-    char path[320];
+    char path[SIZE];
-    char physicalLocation[128];
+    char physicalLocation[SIZE];
     int absMax[ABS_MAX];
     int absMin[ABS_MAX];
 
-    ControllerInput inputs[320];
+    ControllerInput inputs[MAX_INPUTS];
     int inputCount;
 
     ArcadeInput keyTriggers[KEY_MAX];

src/lindbergh/input.c

@@ -621,10 +621,13 @@ void sdlEventShooting(SDL_Event *event)
             setSwitch(PLAYER_2, BUTTON_1, event->type == SDL_KEYDOWN);
 
         else if (event->key.keysym.sym == SDLK_x)
-            setSwitch(PLAYER_2, BUTTON_1, event->type == SDL_KEYDOWN);
+            setSwitch(PLAYER_2, BUTTON_2, event->type == SDL_KEYDOWN);
 
         else if (event->key.keysym.sym == SDLK_c)
-            setSwitch(PLAYER_2, BUTTON_1, event->type == SDL_KEYDOWN);
+            setSwitch(PLAYER_2, BUTTON_3, event->type == SDL_KEYDOWN);
+
+        else if (event->key.keysym.sym == SDLK_v)
+            setSwitch(PLAYER_2, BUTTON_4, event->type == SDL_KEYDOWN);
 
         else if (event->key.keysym.sym == SDLK_u)
             setSwitch(PLAYER_2, BUTTON_UP, event->type == SDL_KEYDOWN);

src/lindbergh/passthrough.c

@@ -160,6 +160,10 @@ void *readJVSFrameThread(void * arg)
         waitForEnd = 0;
 
         do {
+            while (jvsFrameBuffer.ready == 1)
+            {
+                usleep(1);
+            }
             // printf("SERIAL thread debug: trying to read byte.\n");
             // Try to read a byte from serial, this call will be blocking if VMIN > 0 and VTIME = 0
             bytesRead = read(fd, &localBuffer[byteCount], 1);
@@ -237,14 +241,13 @@ int startJVSFrameThread(int * fd) {
  * @return
  */
 JVSFrame readJVSFrameFromThread() {
-
     JVSFrame frame;
     // Lock while reading/writing to shared frame
     pthread_mutex_lock(&jvsBuffer_lock);
 
     // Check if we have a valid frame
     if (jvsFrameBuffer.ready == 1) {
-        frame = jvsFrameBuffer;
+        memcpy(&frame, &jvsFrameBuffer, sizeof(JVSFrame));
         // It has been red, we disable this frame
         jvsFrameBuffer.ready = 0;
     } else {

src/lindbergh/resolution.c

@@ -370,8 +370,8 @@ int isTestMode()
 
 void myGlBindTexture(GLenum target, GLuint texture)
 {
-    // const char *targetName = "";
+    curTarget = target;
-    // switch (target)
+    curTextureID = texture;
 
     void (*_glBindTexture)(GLenum, GLuint) = dlsym(RTLD_NEXT, "glBindTexture");
     _glBindTexture(target, texture);