len = fread(pname, sizeof(char), TDM_NAME_LEN, h);
if (len == 0) {
- char *p = strncpy(pname, "NO NAME", sizeof(pname) - 1);
- len = p - pname;
+ strncpy(pname, "NO NAME", sizeof(pname));
+ pname[sizeof(pname) - 1] = '\0';
}
- pname[len - 1] = '\0';
- strncpy(name, pname, size - 1);
+ strncpy(name, pname, size);
name[size - 1] = '\0';
fclose(h);
return;
}
- if ((mode->hdisplay != current_mode->hdisplay) || (mode->vdisplay != current_mode->vdisplay)) {
+ if (current_mode && ((mode->hdisplay != current_mode->hdisplay) || (mode->vdisplay != current_mode->vdisplay))) {
LIST_FOR_EACH_ENTRY_SAFE(vb, vbb, &voutput_info->buffer_list, link) {
if (vb->wl_buffer == voutput_info->attach_buffer->wl_buffer)
voutput_info->attach_buffer->need_reset = 1;
voutput_info->attach_buffer = voutput_buffer;
- tbm_surface_internal_ref(buffer);
wl_tdm_voutput_send_attach_buffer(voutput_info->resource, voutput_buffer->wl_buffer);
return TDM_ERROR_NONE;
return;
}
- voutput = tdm_voutput_create(private_server->private_loop->dpy, name, &ret);
+ voutput = tdm_display_voutput_create(private_server->private_loop->dpy, name, &ret);
if (!voutput) {
TDM_ERR("voutput creation fail(%s)(%d).", name, ret);
wl_resource_post_error(resource, WL_DISPLAY_ERROR_NO_MEMORY,
char buffer[TDM_DEBUG_REPLY_MSG_LEN];
int copylen = TDM_MIN(size, sizeof(buffer) - 1);
- strncpy(buffer, m, copylen);
+ memcpy(buffer, m, sizeof(buffer));
+ buffer[sizeof(buffer) - 1] = '\0';
+
m += copylen;
size -= copylen;