chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal-file: protect against alloca(0)
[elogind.git]
/
src
/
libsystemd-id128
/
sd-id128.c
diff --git
a/src/libsystemd-id128/sd-id128.c
b/src/libsystemd-id128/sd-id128.c
index 64ddd092366add557967e34b3fb86162d905f1a8..07d241534e53378c1d4c6a9042396264b58a28fe 100644
(file)
--- a/
src/libsystemd-id128/sd-id128.c
+++ b/
src/libsystemd-id128/sd-id128.c
@@
-23,16
+23,14
@@
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
-#include "sd-id128.h"
-
#include "util.h"
#include "macro.h"
#include "util.h"
#include "macro.h"
+#include "sd-id128.h"
_public_ char *sd_id128_to_string(sd_id128_t id, char s[33]) {
unsigned n;
_public_ char *sd_id128_to_string(sd_id128_t id, char s[33]) {
unsigned n;
- if (!s)
- return NULL;
+ assert_return(s, NULL);
for (n = 0; n < 16; n++) {
s[n*2] = hexchar(id.bytes[n] >> 4);
for (n = 0; n < 16; n++) {
s[n*2] = hexchar(id.bytes[n] >> 4);
@@
-49,10
+47,8
@@
_public_ int sd_id128_from_string(const char s[], sd_id128_t *ret) {
sd_id128_t t;
bool is_guid = false;
sd_id128_t t;
bool is_guid = false;
- if (!s)
- return -EINVAL;
- if (!ret)
- return -EINVAL;
+ assert_return(s, -EINVAL);
+ assert_return(ret, -EINVAL);
for (n = 0, i = 0; n < 16;) {
int a, b;
for (n = 0, i = 0; n < 16;) {
int a, b;
@@
-116,8
+112,7
@@
_public_ int sd_id128_get_machine(sd_id128_t *ret) {
unsigned j;
sd_id128_t t;
unsigned j;
sd_id128_t t;
- if (!ret)
- return -EINVAL;
+ assert_return(ret, -EINVAL);
if (saved_machine_id_valid) {
*ret = saved_machine_id;
if (saved_machine_id_valid) {
*ret = saved_machine_id;
@@
-167,8
+162,7
@@
_public_ int sd_id128_get_boot(sd_id128_t *ret) {
sd_id128_t t;
char *p;
sd_id128_t t;
char *p;
- if (!ret)
- return -EINVAL;
+ assert_return(ret, -EINVAL);
if (saved_boot_id_valid) {
*ret = saved_boot_id;
if (saved_boot_id_valid) {
*ret = saved_boot_id;
@@
-218,8
+212,7
@@
_public_ int sd_id128_randomize(sd_id128_t *ret) {
sd_id128_t t;
ssize_t k;
sd_id128_t t;
ssize_t k;
- if (!ret)
- return -EINVAL;
+ assert_return(ret, -EINVAL);
fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
if (fd < 0)
fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
if (fd < 0)