projects
/
platform
/
core
/
uifw
/
libtdm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tizen' into sandbox/cyeon/devel
[platform/core/uifw/libtdm.git]
/
src
/
tdm_server.c
diff --git
a/src/tdm_server.c
b/src/tdm_server.c
index
25ad51d
..
a54e482
100644
(file)
--- a/
src/tdm_server.c
+++ b/
src/tdm_server.c
@@
-148,12
+148,11
@@
_tdm_server_get_process_name(pid_t pid, char *name, unsigned int size)
len = fread(pname, sizeof(char), TDM_NAME_LEN, h);
if (len == 0) {
len = fread(pname, sizeof(char), TDM_NAME_LEN, h);
if (len == 0) {
- strncpy(pname, "NO NAME",
7
);
-
len = 8
;
+ 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);
name[size - 1] = '\0';
fclose(h);
@@
-1224,7
+1223,6
@@
tdm_voutput_attach_buffer(tdm_voutput *voutput, tbm_surface_h buffer)
voutput_info->attach_buffer = voutput_buffer;
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;
wl_tdm_voutput_send_attach_buffer(voutput_info->resource, voutput_buffer->wl_buffer);
return TDM_ERROR_NONE;
@@
-1403,7
+1401,9
@@
_tdm_server_cb_debug(struct wl_client *client, struct wl_resource *resource, con
char buffer[TDM_DEBUG_REPLY_MSG_LEN];
int copylen = TDM_MIN(size, sizeof(buffer) - 1);
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;
m += copylen;
size -= copylen;