<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.10
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/16551625277ea1eb0c8ba67d7e531b492c03389b">https://github.com/macports/macports-base/commit/16551625277ea1eb0c8ba67d7e531b492c03389b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/release-2.10 by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 165516252 Guard use of strchrnul
</span>165516252 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 16551625277ea1eb0c8ba67d7e531b492c03389b
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Apr 18 23:16:02 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> Guard use of strchrnul
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This was introduced in macOS 15.4, so using that SDK with a deployment
</span><span style='display:block; white-space:pre;color:#404040;'> target of 15.0 would create a binary that crashes on macOS versions
</span><span style='display:block; white-space:pre;color:#404040;'> >= 15.0 and < 15.4.
</span>---
vendor/tcl8.6.14/pkgs/sqlite3.44.2/compat/sqlite3/sqlite3.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tcl8.6.14/pkgs/sqlite3.44.2/compat/sqlite3/sqlite3.c b/vendor/tcl8.6.14/pkgs/sqlite3.44.2/compat/sqlite3/sqlite3.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 470264ef3..d8a787cf3 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tcl8.6.14/pkgs/sqlite3.44.2/compat/sqlite3/sqlite3.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tcl8.6.14/pkgs/sqlite3.44.2/compat/sqlite3/sqlite3.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31023,10 +31023,18 @@ SQLITE_API void sqlite3_str_vappendf(
</span> if( c!='%' ){
bufpt = (char *)fmt;
#if HAVE_STRCHRNUL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fmt = strchrnul(fmt, '%');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__builtin_available(macOS 15.4, iOS 18.4, tvOS 18.4, watchOS 11.4, *))
</span> #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- do{ fmt++; }while( *fmt && *fmt != '%' );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (1)
</span> #endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmt = strchrnul(fmt, '%');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do{ fmt++; }while( *fmt && *fmt != '%' );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> sqlite3_str_append(pAccum, bufpt, (int)(fmt - bufpt));
if( *fmt==0 ) break;
}
</pre><pre style='margin:0'>
</pre>