Merge pull request #4391 from mjunix/small-fixes

Small fixes
joncampbell123 · Jul 30, 2023 · e0afb06 · e0afb06
2 parents 2615e65 + cd5a96b
commit e0afb06
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/hardware/parport/printer.cpp b/src/hardware/parport/printer.cpp
@@ -1136,7 +1136,7 @@ bool CPrinter::processCommandChar(uint8_t ch)
 			    numParam = 0;
 			    break;
 		    case 0x274: // Assign character table (ESC (t)
-			    if (params[2] < 4 && params[3] < 16)
+			    if (params[2] < 4 && params[3] < 15)
 			    {
 				    charTables[params[2]] = codepages[params[3]];
 				    //LOG_MSG("curr table: %d, p2: %d, p3: %d",curCharTable,params[2],params[3]);

diff --git a/src/output/direct3d/direct3d.cpp b/src/output/direct3d/direct3d.cpp
@@ -1413,7 +1413,7 @@ HRESULT CDirect3D::CreateDisplayTexture(void)
 	// Set textures
 	if(FAILED(psEffect->SetTextures(lpTexture, lpWorkTexture1, lpWorkTexture2, lpHq2xLookupTexture))) {
 	    LOG_MSG("D3D:Failed to set PS textures");
-	    return false;
+	    return E_FAIL;
 	}
 
     }

diff --git a/vs/sdl/src/main/win32/SDL_win32_main.c b/vs/sdl/src/main/win32/SDL_win32_main.c
@@ -59,7 +59,7 @@ static void UnEscapeQuotes( char *arg )
 	char *last = NULL;
 
 	while( *arg ) {
-		if( *arg == '"' && *last == '\\' ) {
+		if( *arg == '"' && last && *last == '\\' ) {
 			char *c_curr = arg;
 			char *c_last = last;
 

diff --git a/vs/sdl/src/video/SDL_yuv.c b/vs/sdl/src/video/SDL_yuv.c
@@ -123,7 +123,7 @@ int SDL_DisplayYUVOverlay(SDL_Overlay *overlay, SDL_Rect *dstrect)
 		dsth -= extra;
 	}
 	if ( srcw <= 0 || srch <= 0 ||
-	     srch <= 0 || dsth <= 0 ) {
+	     dstw <= 0 || dsth <= 0 ) {
 		return 0;
 	}
 	/* Ugh, I can't wait for SDL_Rect to be int values */