<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/16029">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix osmo_quote_str_c() to alloc sufficient size<br><br>osmo_quote_str_c() allocates too small buffers when the quoted string also<br>contains unprintable characters that need escaping (which of course are longer<br>than strlen() + 3 that it currently naively assumes).<br><br>Add osmo_quote_str_buf3() to actually return the required buffer size<br>(sb.chars_needed), osmo_quote_str_buf2() unfortunately returns the char buffer<br>itself.<br><br>Hence implement osmo_quote_str_c() using OSMO_NAME_C_IMPL(), which now always<br>allocates sufficient size.<br><br>Change-Id: I04d97e8eec93ffb74006503c356a68cceaf429ac<br>---<br>M include/osmocom/core/utils.h<br>M src/utils.c<br>2 files changed, 18 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/29/16029/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h</span><br><span>index ef58eeb..cb69b64 100644</span><br><span>--- a/include/osmocom/core/utils.h</span><br><span>+++ b/include/osmocom/core/utils.h</span><br><span>@@ -151,6 +151,7 @@</span><br><span> char *osmo_escape_str_c(const void *ctx, const char *str, int in_len);</span><br><span> const char *osmo_quote_str(const char *str, int in_len);</span><br><span> char *osmo_quote_str_buf2(char *buf, size_t bufsize, const char *str, int in_len);</span><br><span style="color: hsl(120, 100%, 40%);">+size_t osmo_quote_str_buf3(char *buf, size_t bufsize, const char *str, int in_len);</span><br><span> const char *osmo_quote_str_buf(const char *str, int in_len, char *buf, size_t bufsize);</span><br><span> char *osmo_quote_str_c(const void *ctx, const char *str, int in_len);</span><br><span> </span><br><span>diff --git a/src/utils.c b/src/utils.c</span><br><span>index ea1de0f..95245f5 100644</span><br><span>--- a/src/utils.c</span><br><span>+++ b/src/utils.c</span><br><span>@@ -756,6 +756,20 @@</span><br><span> return osmo_escape_str_buf2(buf, in_len+1, str, in_len);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Like osmo_quote_str_buf3(), but returning the buf instead of the required number of characters.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The function signature is suitable for OSMO_STRBUF_APPEND_NOLEN().</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] buf string buffer to write escaped characters to.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] bufsize sizeof(buf).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] str A string that may contain any characters.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] in_len Pass -1 to print until nul char, or >= 0 to force a length.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return buf.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+char *osmo_quote_str_buf2(char *buf, size_t bufsize, const char *str, int in_len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_quote_str_buf3(buf, bufsize, str, in_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return buf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Like osmo_escape_str_buf2(), but returns double-quotes around a string, or "NULL" for a NULL string.</span><br><span> * This allows passing any char* value and get its C representation as string.</span><br><span> * The function signature is suitable for OSMO_STRBUF_APPEND_NOLEN().</span><br><span>@@ -765,7 +779,7 @@</span><br><span> * \param[in] in_len Pass -1 to print until nul char, or >= 0 to force a length.</span><br><span> * \return Number of characters that would be written if bufsize were large enough excluding '\0' (like snprintf()).</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-char *osmo_quote_str_buf2(char *buf, size_t bufsize, const char *str, int in_len)</span><br><span style="color: hsl(120, 100%, 40%);">+size_t osmo_quote_str_buf3(char *buf, size_t bufsize, const char *str, int in_len)</span><br><span> {</span><br><span> struct osmo_strbuf sb = { .buf = buf, .len = bufsize };</span><br><span> if (!str)</span><br><span>@@ -775,7 +789,7 @@</span><br><span> OSMO_STRBUF_APPEND_NOLEN(sb, osmo_escape_str_buf2, str, in_len);</span><br><span> OSMO_STRBUF_PRINTF(sb, "\"");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- return buf;</span><br><span style="color: hsl(120, 100%, 40%);">+ return sb.chars_needed;</span><br><span> }</span><br><span> </span><br><span> /*! Like osmo_quote_str_buf2, but with unusual ordering of arguments, and may sometimes return string constants instead</span><br><span>@@ -815,21 +829,7 @@</span><br><span> */</span><br><span> char *osmo_quote_str_c(const void *ctx, const char *str, int in_len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- size_t len = in_len == -1 ? strlen(str) : in_len;</span><br><span style="color: hsl(0, 100%, 40%);">- char *buf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* account for two quote characters + terminating NUL */</span><br><span style="color: hsl(0, 100%, 40%);">- len += 3;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* some minimum length for things like "NULL" or "(error)" */</span><br><span style="color: hsl(0, 100%, 40%);">- if (len < 32)</span><br><span style="color: hsl(0, 100%, 40%);">- len = 32;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- buf = talloc_size(ctx, len);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!buf)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_quote_str_buf2(buf, len, str, in_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_NAME_C_IMPL(ctx, 32, "(error)", osmo_quote_str_buf3, str, in_len)</span><br><span> }</span><br><span> </span><br><span> /*! perform an integer square root operation on unsigned 32bit integer.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/16029">change 16029</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/16029"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I04d97e8eec93ffb74006503c356a68cceaf429ac </div>
<div style="display:none"> Gerrit-Change-Number: 16029 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>