diff options
| author | wm4 <wm4@nowhere> | 2012-10-12 10:17:55 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-12 11:53:53 +0200 |
| commit | 85d185441acf4691c830db2f40235ac927410d45 (patch) | |
| tree | 211177793cd5d6b399346be661af8e7528f0f411 /talloc.c | |
| parent | 65fc530f0c3ff02f982a0e4c74988d4a53730f04 (diff) | |
| parent | e1b15dee4c250bf6509594e241eb2856c8d21e0f (diff) | |
| download | mpv-85d185441acf4691c830db2f40235ac927410d45.tar.bz2 mpv-85d185441acf4691c830db2f40235ac927410d45.tar.xz | |
Merge branch 'input_changes' into master
Conflicts:
DOCS/man/en/vo.rst
etc/input.conf
input/input.c
m_property.c
Diffstat (limited to 'talloc.c')
| -rw-r--r-- | talloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1421,7 +1421,7 @@ char *talloc_strdup_append_buffer(char *s, const char *a) char *talloc_strndup_append(char *s, const char *a, size_t n) { if (unlikely(!s)) { - return talloc_strdup(NULL, a); + return talloc_strndup(NULL, a, n); } if (unlikely(!a)) { @@ -1440,7 +1440,7 @@ char *talloc_strndup_append_buffer(char *s, const char *a, size_t n) size_t slen; if (unlikely(!s)) { - return talloc_strdup(NULL, a); + return talloc_strndup(NULL, a, n); } if (unlikely(!a)) { |