return 0;
}
-static int path_open(const char *name, const char *search, char *buf, size_t buf_size)
+static int path_open(const char *name, const char *s, char *buf, size_t buf_size)
{
- const char *s=search, *z;
- int l, fd;
+ size_t l;
+ int fd;
for (;;) {
- while (*s==':') s++;
- if (!*s) return -1;
- z = strchr(s, ':');
- l = z ? z-s : strlen(s);
- snprintf(buf, buf_size, "%.*s/%s", l, s, name);
+ s += strspn(s, ":\n");
+ l = strcspn(s, ":\n");
+ if (l-1 >= INT_MAX) return -1;
+ if (snprintf(buf, buf_size, "%.*s/%s", (int)l, s, name) >= buf_size)
+ continue;
if ((fd = open(buf, O_RDONLY|O_CLOEXEC))>=0) return fd;
s += l;
}
if (!sys_path) {
FILE *f = fopen(ETC_LDSO_PATH, "rbe");
if (f) {
- if (getline(&sys_path, (size_t[1]){0}, f) > 0) {
- size_t l = strlen(sys_path);
- if (l && sys_path[l-1]=='\n')
- sys_path[l-1] = 0;
+ if (getdelim(&sys_path, (size_t[1]){0}, 0, f) <= 0) {
+ if (sys_path) free(sys_path);
+ sys_path = "";
}
fclose(f);
}
void *__tls_get_addr(size_t *v)
{
pthread_t self = __pthread_self();
- if (self->dtv && v[0]<=(size_t)self->dtv[0] && self->dtv[v[0]])
+ if (v[0]<=(size_t)self->dtv[0] && self->dtv[v[0]])
return (char *)self->dtv[v[0]]+v[1];
/* Block signals to make accessing new TLS async-signal-safe */
sigset_t set;
pthread_sigmask(SIG_BLOCK, SIGALL_SET, &set);
- if (self->dtv && v[0]<=(size_t)self->dtv[0] && self->dtv[v[0]]) {
+ if (v[0]<=(size_t)self->dtv[0] && self->dtv[v[0]]) {
pthread_sigmask(SIG_SETMASK, &set, 0);
return (char *)self->dtv[v[0]]+v[1];
}
for (p=head; p->tls_id != v[0]; p=p->next);
/* Get new DTV space from new DSO if needed */
- if (!self->dtv || v[0] > (size_t)self->dtv[0]) {
+ if (v[0] > (size_t)self->dtv[0]) {
void **newdtv = p->new_dtv +
(v[0]+1)*sizeof(void *)*a_fetch_add(&p->new_dtv_idx,1);
- if (self->dtv) memcpy(newdtv, self->dtv,
+ memcpy(newdtv, self->dtv,
((size_t)self->dtv[0]+1) * sizeof(void *));
newdtv[0] = (void *)v[0];
self->dtv = newdtv;