chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a1a4a25
)
memfd: escape the comm field we get from PR_GET_NAME, but assume everything else...
author
Lennart Poettering
<lennart@poettering.net>
Tue, 19 Aug 2014 20:35:04 +0000
(22:35 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 19 Aug 2014 20:35:04 +0000
(22:35 +0200)
src/shared/memfd.c
patch
|
blob
|
history
diff --git
a/src/shared/memfd.c
b/src/shared/memfd.c
index c21642f49ae9b568a6ec9b2822b9cb5ff0ee7130..1feca0c9799c2da43e9937148d2460f2234573e4 100644
(file)
--- a/
src/shared/memfd.c
+++ b/
src/shared/memfd.c
@@
-32,17
+32,10
@@
#include "utf8.h"
int memfd_new(const char *name) {
#include "utf8.h"
int memfd_new(const char *name) {
-
_cleanup_free_ char *g = NULL;
int fd;
_cleanup_free_ char *g = NULL;
int fd;
- if (name) {
- g = utf8_escape_invalid(name);
- if (!g)
- return -ENOMEM;
-
- name = g;
- } else {
+ if (!name) {
char pr[17] = {};
/* If no name is specified we generate one. We include
char pr[17] = {};
/* If no name is specified we generate one. We include
@@
-54,7
+47,13
@@
int memfd_new(const char *name) {
if (isempty(pr))
name = "sd";
else {
if (isempty(pr))
name = "sd";
else {
- g = strappend("sd-", pr);
+ _cleanup_free_ char *e = NULL;
+
+ e = utf8_escape_invalid(pr);
+ if (!e)
+ return -ENOMEM;
+
+ g = strappend("sd-", e);
if (!g)
return -ENOMEM;
if (!g)
return -ENOMEM;
@@
-130,7
+129,7
@@
int memfd_get_size(int fd, uint64_t *sz) {
return -errno;
*sz = stat.st_size;
return -errno;
*sz = stat.st_size;
- return
r
;
+ return
0
;
}
int memfd_set_size(int fd, uint64_t sz) {
}
int memfd_set_size(int fd, uint64_t sz) {
@@
-142,7
+141,7
@@
int memfd_set_size(int fd, uint64_t sz) {
if (r < 0)
return -errno;
if (r < 0)
return -errno;
- return
r
;
+ return
0
;
}
int memfd_new_and_map(const char *name, size_t sz, void **p) {
}
int memfd_new_and_map(const char *name, size_t sz, void **p) {