<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=US-ASCII" http-equiv="Content-Type"> <title> GitLab </title> <style>img { max-width: 100%; height: auto; } </style> </head> <body> <div class="content"> <h3> Marc-André Lureau pushed to branch master at <a href="https://gitlab.freedesktop.org/slirp/libslirp">slirp / libslirp</a> </h3> <h4> Commits: </h4> <ul> <li> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/088ecbe8c90cebea6aa3989263ea892567df6306">088ecbe8</a> <div> by Marc-André Lureau at 2020-07-08T11:54:27+04:00 </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">util: do not silently truncate snprintf() always nul-terminate. The return value is the number of business bytes that would be produced if the buffer was large enough. If it returns N for a N size buffer, it means truncation occurred (and we lost one business byte). Related to: #22 Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> </pre> </li> <li> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/53a3a938618f97c0439abd313a74791e13b313d6">53a3a938</a> <div> by Marc-André Lureau at 2020-07-08T11:09:56+00:00 </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Merge branch 'slirp-fmt-truncate' into 'master' util: do not silently truncate See merge request slirp/libslirp!45</pre> </li> </ul> <h4>1 changed file:</h4> <ul> <li class="file-stats"> <a href="#67c319180cbcafb0d1d073f70f07d14aff317006"> src/util.c </a> </li> </ul> <h4>Changes:</h4> <li id="67c319180cbcafb0d1d073f70f07d14aff317006"> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/compare/ebf7bc3a5e9094eb6f9efbae7ef8b0f57583e347...53a3a938618f97c0439abd313a74791e13b313d6#67c319180cbcafb0d1d073f70f07d14aff317006">src/util.c</a> <hr> <table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0"> <tr class="line_holder match" id="" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="392" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="392" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -392,7 +392,7 @@ int slirp_fmt(char *str, size_t size, const char *format, ...)</td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="392" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 392 </td> <td class="diff-line-num new_line" data-linenumber="392" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 392 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> rv = slirp_vsnprintf(str, size, format, args); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="393" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 393 </td> <td class="diff-line-num new_line" data-linenumber="393" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 393 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> va_end(args); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="394" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 394 </td> <td class="diff-line-num new_line" data-linenumber="394" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 394 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="diff-line-num old old_line" data-linenumber="395" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 395 </td> <td class="diff-line-num new_line old" data-linenumber="395" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- if (rv > size) { </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="diff-line-num new old_line" data-linenumber="396" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="diff-line-num new new_line" data-linenumber="395" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 395 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ if (rv >= size) { </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="396" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 396 </td> <td class="diff-line-num new_line" data-linenumber="396" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 396 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> g_critical("slirp_fmt() truncation"); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="397" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 397 </td> <td class="diff-line-num new_line" data-linenumber="397" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 397 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> } </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="398" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 398 </td> <td class="diff-line-num new_line" data-linenumber="398" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 398 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> </table> </li> </div> <div class="footer" style="margin-top: 10px;"> — <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/compare/ebf7bc3a5e9094eb6f9efbae7ef8b0f57583e347...53a3a938618f97c0439abd313a74791e13b313d6">View it on GitLab</a>. You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings. </div> </body> </html>