Page MenuHomeFreeBSD
Differential D9403

Update to 3.2.5
ClosedPublic
Actions

Authored by krion on Feb 1 2017, 11:44 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 5, 2:04 AM
Unknown Object (File)
Thu, Mar 20, 3:48 PM
Unknown Object (File)
Mar 11 2025, 3:08 AM
Unknown Object (File)
Mar 4 2025, 5:06 AM
Unknown Object (File)
Feb 15 2025, 6:50 PM
Unknown Object (File)
Jan 30 2025, 7:27 AM
Unknown Object (File)
Jan 28 2025, 9:39 AM
Unknown Object (File)
Jan 22 2025, 6:47 PM
View All Files
Subscribers
None

Details

Reviewers
fjoe
mat
Commits
rP433106: Update to 3.2.5
Summary

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216689

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 7117
Build 7293: arc lint + arc unit

Event Timeline

krion updated this revision to Diff 24623.Feb 1 2017, 11:44 AM
krion retitled this revision from to Update to 3.2.5.
krion updated this object.
krion edited the test plan for this revision. (Show Details)
krion added a reviewer: mat.
krion added a reviewer: fjoe.Feb 1 2017, 8:36 PM
mat accepted this revision.Feb 1 2017, 9:02 PM
mat edited edge metadata.
This revision is now accepted and ready to land.Feb 1 2017, 9:02 PM
Closed by commit rP433106: Update to 3.2.5 (authored by krion). · Explain WhyFeb 1 2017, 9:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
multimedia/
gtk-youtube-viewer/
2 lines
6 lines

Diff 24623

View Options

multimedia/gtk-youtube-viewer/Makefile

Show First 20 Lines • Show All 231 Lines • ▼ Show 20 Lines
static int static int
parse_pnp_list(const char *desc, char **new_desc, pnp_list *list) parse_pnp_list(const char *desc, char **new_desc, pnp_list *list)
{ {
const char *walker, *ep; const char *walker, *ep;
const char *colon, *semi; const char *colon, *semi;
struct pnp_elt *elt; struct pnp_elt *elt;
char *nd; char *nd;
char type[8], key[32]; char type[8], key[32];
char buf[1024];
size_t ndspace;
int off; int off;
walker = desc; walker = desc;
ep = desc + strlen(desc); ep = desc + strlen(desc);
off = 0; off = 0;
nd = *new_desc = malloc(strlen(desc) + 1); nd = buf;
ndspace = sizeof(buf);
nd[0] = '\0';
if (verbose > 1) if (verbose > 1)
printf("Converting %s into a list\n", desc); printf("Converting %s into a list\n", desc);
while (walker < ep) { while (walker < ep) {
colon = strchr(walker, ':'); colon = strchr(walker, ':');
semi = strchr(walker, ';'); semi = strchr(walker, ';');
if (semi != NULL && semi < colon) if (semi != NULL && semi < colon)
goto err; goto err;
if (colon - walker > sizeof(type)) if (colon - walker > sizeof(type))
▲ Show 20 Lines • Show All 77 Lines • ▼ Show 20 Lines while (walker < ep) {
} else if (elt->pe_kind == TYPE_T) { } else if (elt->pe_kind == TYPE_T) {
/* doesn't actually consume space in the table */ /* doesn't actually consume space in the table */
off = elt->pe_offset; off = elt->pe_offset;
} else { } else {
elt->pe_offset = roundup2(elt->pe_offset, sizeof(void *)); elt->pe_offset = roundup2(elt->pe_offset, sizeof(void *));
off = elt->pe_offset + sizeof(void *); off = elt->pe_offset + sizeof(void *);
} }
if (elt->pe_kind & TYPE_PAIRED) { if (elt->pe_kind & TYPE_PAIRED) {
char *word, *ctx; char *word, *ctx, type;
int n;
for (word = strtok_r(key, "/", &ctx); for (word = strtok_r(key, "/", &ctx);
word; word = strtok_r(NULL, "/", &ctx)) { word; word = strtok_r(NULL, "/", &ctx)) {
sprintf(nd, "%c:%s;", elt->pe_kind & TYPE_FLAGGED ? 'J' : 'I', type = elt->pe_kind & TYPE_FLAGGED ? 'J' : 'I';
word); n = snprintf(nd, ndspace, "%c:%s;", type, word);
nd += strlen(nd); if (n >= ndspace)
errx(1, "Exhausted space converting "
"description %s", desc);
nd += n;
ndspace -= n;
} }
} }
else { else {
char type;
int n;
if (elt->pe_kind & TYPE_FLAGGED) if (elt->pe_kind & TYPE_FLAGGED)
*nd++ = 'J'; type = 'J';
else if (elt->pe_kind & TYPE_GE) else if (elt->pe_kind & TYPE_GE)
*nd++ = 'G'; type = 'G';
else if (elt->pe_kind & TYPE_LE) else if (elt->pe_kind & TYPE_LE)
*nd++ = 'L'; type = 'L';
else if (elt->pe_kind & TYPE_MASK) else if (elt->pe_kind & TYPE_MASK)
*nd++ = 'M'; type = 'M';
else if (elt->pe_kind & TYPE_INT) else if (elt->pe_kind & TYPE_INT)
*nd++ = 'I'; type = 'I';
else if (elt->pe_kind == TYPE_D) else if (elt->pe_kind == TYPE_D)
*nd++ = 'D'; type = 'D';
else if (elt->pe_kind == TYPE_Z || elt->pe_kind == TYPE_E) else if (elt->pe_kind == TYPE_Z || elt->pe_kind == TYPE_E)
*nd++ = 'Z'; type = 'Z';
else if (elt->pe_kind == TYPE_T) else if (elt->pe_kind == TYPE_T)
*nd++ = 'T'; type = 'T';
else else
errx(1, "Impossible type %x\n", elt->pe_kind); errx(1, "Impossible type %x\n", elt->pe_kind);
*nd++ = ':'; n = snprintf(nd, ndspace, "%c:%s;", type, key);
strcpy(nd, key); if (n >= ndspace)
nd += strlen(nd); errx(1, "Exhausted space converting "
*nd++ = ';'; "description %s", desc);
impUnsubmitted
Not Done
Inline Actions

It would be better to just ignore this module in this case.

imp: It would be better to just ignore this module in this case.
kibUnsubmitted
Not Done
Inline Actions

I think a vitally important data to print for user is the kld name that is causing troubles. At least, the file can be removed and kldxref re-run.

kib: I think a vitally important data to print for user is the kld name that is causing troubles.
jrtc27AuthorUnsubmitted
Done
Inline Actions

I think a vitally important data to print for user is the kld name that is causing troubles. At least, the file can be removed and kldxref re-run.

The same is true for all the other errors in this function and others like record_buf and record_string, as well as everything that calls check. Ideally the error reporting would be overhauled, but the file name is not currently available here so that change would be more invasive (and would only fix one of the many problems). Plus if you get one of these cryptic errors you can run it with -v to see what file it choked on.

jrtc27: > I think a vitally important data to print for user is the kld name that is causing troubles.
jrtc27AuthorUnsubmitted
Done
Inline Actions

Well, check itself is a bit dodgy (a hidden break on error) but not inherently problematic, except that parse_entry's return value is never consulted. Lots of issues here if you want good error reporting.

jrtc27: Well, `check` itself is a bit dodgy (a hidden `break` on error) but not inherently problematic…
nd += n;
ndspace -= n;
} }
} }
*nd++ = '\0'; *new_desc = strdup(buf);
return (0); return (0);
err: err:
errx(1, "Parse error of description string %s", desc); errx(1, "Parse error of description string %s", desc);
} }
static int static int
parse_entry(struct mod_metadata *md, const char *cval, parse_entry(struct mod_metadata *md, const char *cval,
struct elf_file *ef, const char *kldname) struct elf_file *ef, const char *kldname)
▲ Show 20 Lines • Show All 381 Lines • Show Last 20 Lines
View Options

multimedia/gtk-youtube-viewer/distinfo

Show First 20 Lines • Show All 231 Lines • ▼ Show 20 Lines
static int static int
parse_pnp_list(const char *desc, char **new_desc, pnp_list *list) parse_pnp_list(const char *desc, char **new_desc, pnp_list *list)
{ {
const char *walker, *ep; const char *walker, *ep;
const char *colon, *semi; const char *colon, *semi;
struct pnp_elt *elt; struct pnp_elt *elt;
char *nd; char *nd;
char type[8], key[32]; char type[8], key[32];
char buf[1024];
size_t ndspace;
int off; int off;
walker = desc; walker = desc;
ep = desc + strlen(desc); ep = desc + strlen(desc);
off = 0; off = 0;
nd = *new_desc = malloc(strlen(desc) + 1); nd = buf;
ndspace = sizeof(buf);
nd[0] = '\0';
if (verbose > 1) if (verbose > 1)
printf("Converting %s into a list\n", desc); printf("Converting %s into a list\n", desc);
while (walker < ep) { while (walker < ep) {
colon = strchr(walker, ':'); colon = strchr(walker, ':');
semi = strchr(walker, ';'); semi = strchr(walker, ';');
if (semi != NULL && semi < colon) if (semi != NULL && semi < colon)
goto err; goto err;
if (colon - walker > sizeof(type)) if (colon - walker > sizeof(type))
▲ Show 20 Lines • Show All 77 Lines • ▼ Show 20 Lines while (walker < ep) {
} else if (elt->pe_kind == TYPE_T) { } else if (elt->pe_kind == TYPE_T) {
/* doesn't actually consume space in the table */ /* doesn't actually consume space in the table */
off = elt->pe_offset; off = elt->pe_offset;
} else { } else {
elt->pe_offset = roundup2(elt->pe_offset, sizeof(void *)); elt->pe_offset = roundup2(elt->pe_offset, sizeof(void *));
off = elt->pe_offset + sizeof(void *); off = elt->pe_offset + sizeof(void *);
} }
if (elt->pe_kind & TYPE_PAIRED) { if (elt->pe_kind & TYPE_PAIRED) {
char *word, *ctx; char *word, *ctx, type;
int n;
for (word = strtok_r(key, "/", &ctx); for (word = strtok_r(key, "/", &ctx);
word; word = strtok_r(NULL, "/", &ctx)) { word; word = strtok_r(NULL, "/", &ctx)) {
sprintf(nd, "%c:%s;", elt->pe_kind & TYPE_FLAGGED ? 'J' : 'I', type = elt->pe_kind & TYPE_FLAGGED ? 'J' : 'I';
word); n = snprintf(nd, ndspace, "%c:%s;", type, word);
nd += strlen(nd); if (n >= ndspace)
errx(1, "Exhausted space converting "
"description %s", desc);
nd += n;
ndspace -= n;
} }
} }
else { else {
char type;
int n;
if (elt->pe_kind & TYPE_FLAGGED) if (elt->pe_kind & TYPE_FLAGGED)
*nd++ = 'J'; type = 'J';
else if (elt->pe_kind & TYPE_GE) else if (elt->pe_kind & TYPE_GE)
*nd++ = 'G'; type = 'G';
else if (elt->pe_kind & TYPE_LE) else if (elt->pe_kind & TYPE_LE)
*nd++ = 'L'; type = 'L';
else if (elt->pe_kind & TYPE_MASK) else if (elt->pe_kind & TYPE_MASK)
*nd++ = 'M'; type = 'M';
else if (elt->pe_kind & TYPE_INT) else if (elt->pe_kind & TYPE_INT)
*nd++ = 'I'; type = 'I';
else if (elt->pe_kind == TYPE_D) else if (elt->pe_kind == TYPE_D)
*nd++ = 'D'; type = 'D';
else if (elt->pe_kind == TYPE_Z || elt->pe_kind == TYPE_E) else if (elt->pe_kind == TYPE_Z || elt->pe_kind == TYPE_E)
*nd++ = 'Z'; type = 'Z';
else if (elt->pe_kind == TYPE_T) else if (elt->pe_kind == TYPE_T)
*nd++ = 'T'; type = 'T';
else else
errx(1, "Impossible type %x\n", elt->pe_kind); errx(1, "Impossible type %x\n", elt->pe_kind);
*nd++ = ':'; n = snprintf(nd, ndspace, "%c:%s;", type, key);
strcpy(nd, key); if (n >= ndspace)
nd += strlen(nd); errx(1, "Exhausted space converting "
*nd++ = ';'; "description %s", desc);
impUnsubmitted
Not Done
Inline Actions

It would be better to just ignore this module in this case.

imp: It would be better to just ignore this module in this case.
kibUnsubmitted
Not Done
Inline Actions

I think a vitally important data to print for user is the kld name that is causing troubles. At least, the file can be removed and kldxref re-run.

kib: I think a vitally important data to print for user is the kld name that is causing troubles.
jrtc27AuthorUnsubmitted
Done
Inline Actions

I think a vitally important data to print for user is the kld name that is causing troubles. At least, the file can be removed and kldxref re-run.

The same is true for all the other errors in this function and others like record_buf and record_string, as well as everything that calls check. Ideally the error reporting would be overhauled, but the file name is not currently available here so that change would be more invasive (and would only fix one of the many problems). Plus if you get one of these cryptic errors you can run it with -v to see what file it choked on.

jrtc27: > I think a vitally important data to print for user is the kld name that is causing troubles.
jrtc27AuthorUnsubmitted
Done
Inline Actions

Well, check itself is a bit dodgy (a hidden break on error) but not inherently problematic, except that parse_entry's return value is never consulted. Lots of issues here if you want good error reporting.

jrtc27: Well, `check` itself is a bit dodgy (a hidden `break` on error) but not inherently problematic…
nd += n;
ndspace -= n;
} }
} }
*nd++ = '\0'; *new_desc = strdup(buf);
return (0); return (0);
err: err:
errx(1, "Parse error of description string %s", desc); errx(1, "Parse error of description string %s", desc);
} }
static int static int
parse_entry(struct mod_metadata *md, const char *cval, parse_entry(struct mod_metadata *md, const char *cval,
struct elf_file *ef, const char *kldname) struct elf_file *ef, const char *kldname)
▲ Show 20 Lines • Show All 381 Lines • Show Last 20 Lines