Do not use cookie with a zero value

schodet · vincentbernat · commit 193978ce2cf8 · 2025-09-17T00:06:35.000+02:00
This causes problems at least for xdg-desktop-portal-gtk, see flatpak/xdg-desktop-portal-gtk#528. Avoid the problem by not using zero value.
diff --git a/xssproxy.c b/xssproxy.c
@@ -152,13 +152,14 @@ uint32_t inhibit_request(const char *sender, const char *app_name)
     int i;
     for (i=0; i<app->cookies->len; i++)
     {
-        if (i != g_array_index(app->cookies, uint32_t, i))
+        if (i + 1 != g_array_index(app->cookies, uint32_t, i))
         {
             break;
         }
     }
-    g_array_insert_val(app->cookies, i, i);
-    return i;
+    uint32_t cookie = i + 1;
+    g_array_insert_val(app->cookies, i, cookie);
+    return cookie;
 }
 
 void handle_inhibit(DBusConnection *conn, DBusMessage *msg)

Original file line number	Diff line number	Diff line change
`@@ -152,13 +152,14 @@ uint32_t inhibit_request(const char sender, const char app_name)`
`152`	`152`	`int i;`
`153`	`153`	`for (i=0; i<app->cookies->len; i++)`
`154`	`154`	`{`
`155`		`- if (i != g_array_index(app->cookies, uint32_t, i))`
	`155`	`+ if (i + 1 != g_array_index(app->cookies, uint32_t, i))`
`156`	`156`	`{`
`157`	`157`	`break;`
`158`	`158`	`}`
`159`	`159`	`}`
`160`		`- g_array_insert_val(app->cookies, i, i);`
`161`		`- return i;`
	`160`	`+ uint32_t cookie = i + 1;`
	`161`	`+ g_array_insert_val(app->cookies, i, cookie);`
	`162`	`+ return cookie;`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`void handle_inhibit(DBusConnection conn, DBusMessage msg)`