Coverity fixes to new tools.

michaelrsweet · michaelrsweet · commit d777133b13d0 · 2025-04-17T13:51:03.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -55,6 +55,7 @@
 /cups/testarray
 /cups/testcache
 /cups/testclient
+/cups/testclock
 /cups/testconflicts
 /cups/testcreds
 /cups/testcups
diff --git a/tools/cups-oauth.c b/tools/cups-oauth.c
@@ -410,6 +410,7 @@ do_get_user_id(
   cups_json_t	*claims;		// Claims
   char		*json,			// JSON string
 		date[256];		// Date
+  int		ret = 0;		// Exit status
 
 
   // Get the user_id...
@@ -462,12 +463,10 @@ do_get_user_id(
             }
             break;
       }
-
-      return (0);
     }
     else
     {
-      return (1);
+      ret = 1;
     }
   }
   else if ((json = cupsJSONExportString(claims)) != NULL)
@@ -476,7 +475,9 @@ do_get_user_id(
     free(json);
   }
 
-  return (0);
+  cupsJWTDelete(user_id);
+
+  return (ret);
 }
 
 
diff --git a/tools/cups-x509.c b/tools/cups-x509.c
@@ -439,6 +439,7 @@ do_ca(const char *common_name,		// I - Common name
     {
       _cupsLangPrintf(stderr, _("cups-x509: Unable to read '%s'."), csrfile);
       close(csrfd);
+      free(request);
       return (1);
     }
 
diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
@@ -3622,8 +3622,8 @@
 		27A0347B1A8BDB1300650675 /* lpadmin */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lpadmin; sourceTree = BUILT_PRODUCTS_DIR; };
 		27C3E95B2DB04AC500A6ABBF /* cups-x509 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "cups-x509"; sourceTree = BUILT_PRODUCTS_DIR; };
 		27C3E9672DB04ACE00A6ABBF /* cups-oauth */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "cups-oauth"; sourceTree = BUILT_PRODUCTS_DIR; };
-		27C3E9682DB04AFB00A6ABBF /* cups-oauth.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "cups-oauth.c"; sourceTree = "<group>"; };
-		27C3E9692DB04AFB00A6ABBF /* cups-x509.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "cups-x509.c"; sourceTree = "<group>"; };
+		27C3E9682DB04AFB00A6ABBF /* cups-oauth.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "cups-oauth.c"; path = "../tools/cups-oauth.c"; sourceTree = SOURCE_ROOT; };
+		27C3E9692DB04AFB00A6ABBF /* cups-x509.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "cups-x509.c"; path = "../tools/cups-x509.c"; sourceTree = SOURCE_ROOT; };
 		27C89C902613E7C300A58F43 /* cups-tls.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-tls.m4"; path = "../config-scripts/cups-tls.m4"; sourceTree = "<group>"; };
 		27D3037D134148CB00F022B1 /* libcups2.def */ = {isa = PBXFileReference; lastKnownFileType = text; name = libcups2.def; path = ../cups/libcups2.def; sourceTree = "<group>"; };
 		27F515432AAFBECF0045EE21 /* raster-testpage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "raster-testpage.h"; path = "../cups/raster-testpage.h"; sourceTree = "<group>"; };
diff --git a/xcode/cups-oauth.c b/xcode/cups-oauth.c

Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,7 @@ do_get_user_id(`
`410`	`410`	`cups_json_t *claims; // Claims`
`411`	`411`	`char *json, // JSON string`
`412`	`412`	`date[256]; // Date`
	`413`	`+ int ret = 0; // Exit status`
`413`	`414`
`414`	`415`
`415`	`416`	`// Get the user_id...`
`@@ -462,12 +463,10 @@ do_get_user_id(`
`462`	`463`	`}`
`463`	`464`	`break;`
`464`	`465`	`}`
`465`		`-`
`466`		`- return (0);`
`467`	`466`	`}`
`468`	`467`	`else`
`469`	`468`	`{`
`470`		`- return (1);`
	`469`	`+ ret = 1;`
`471`	`470`	`}`
`472`	`471`	`}`
`473`	`472`	`else if ((json = cupsJSONExportString(claims)) != NULL)`
`@@ -476,7 +475,9 @@ do_get_user_id(`
`476`	`475`	`free(json);`
`477`	`476`	`}`
`478`	`477`
`479`		`- return (0);`
	`478`	`+ cupsJWTDelete(user_id);`
	`479`	`+`
	`480`	`+ return (ret);`
`480`	`481`	`}`
`481`	`482`
`482`	`483`
Original file line number	Diff line number	Diff line change
`@@ -439,6 +439,7 @@ do_ca(const char *common_name, // I - Common name`
`439`	`439`	`{`
`440`	`440`	`_cupsLangPrintf(stderr, _("cups-x509: Unable to read '%s'."), csrfile);`
`441`	`441`	`close(csrfd);`
	`442`	`+ free(request);`
`442`	`443`	`return (1);`
`443`	`444`	`}`
`444`	`445`