Skip to content

xf86pciBus: replace on thread-safe strtok_r in xf86ParsePciBusString() #1415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xf86pciBus: replace on thread-safe strtok_r in xf86ParsePciBusString() #1415

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions hw/xfree86/common/xf86pciBus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,15 +268,15 @@ xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func)
* omitted and assumed to be zero, although doing this isn't encouraged.
*/

char *p, *s, *d;
char *p, *s, *d, *last;
const char *id;
int i;

if (StringToBusType(busID, &id) != BUS_PCI)
return FALSE;

s = Xstrdup(id);
p = strtok(s, ":");
s = last = Xstrdup(id);
p = strtok_r(last, ":", &last);
Copy link

@algrid algrid Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a particular reason to use last for both the first and the last argument?
I thought the typical usage would be something like

char *last;
p = strtok_r(s, ":", &last);

if (p == NULL || *p == 0) {
free(s);
return FALSE;
Expand All @@ -300,7 +300,7 @@ xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func)
*bus = atoi(p);
if (d != NULL && *d != 0)
*bus += atoi(d) << 8;
p = strtok(NULL, ":");
p = strtok_r(NULL, ":", &last);
if (p == NULL || *p == 0) {
free(s);
return FALSE;
Expand All @@ -313,7 +313,7 @@ xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func)
}
*device = atoi(p);
*func = 0;
p = strtok(NULL, ":");
p = strtok_r(NULL, ":", &last);
if (p == NULL || *p == 0) {
free(s);
return TRUE;
Expand Down