Changeset 1d94116

Timestamp:

Feb 4, 2020, 2:00:42 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e3fea42

Parents:

e56eb455

Message:

do not allow a NULL printf-format to abort

File:

• libcfa/src/interpose.cfa (modified) (6 diffs)

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan 30 17:47:32 2020
-// Update Count     : 156
+// Last Modified On : Tue Feb  4 11:38:20 2020
+// Update Count     : 161
 //
 
@@ -29 +29 @@
 #include "bits/signal.hfa"                                                              // sigHandler_?
 #include "startup.hfa"                                                                  // STARTUP_PRIORITY_CORE
+#include <assert.h>
 
 //=============================================================================================
@@ -40 +41 @@
 
 typedef void (* generic_fptr_t)(void);
-generic_fptr_t interpose_symbol( const char * symbol, const char * version ) {
+generic_fptr_t interpose_symbol( const char symbol[], const char version[] ) {
         const char * error;
 
@@ -145 +146 @@
 extern "C" {
         void abort( void ) __attribute__(( __nothrow__, __leaf__, __noreturn__ )) {
-                abort( false, NULL ); // FIX ME: 0p does not work
+                abort( false, "%s", "" );
         }
 
@@ -161 +162 @@
 
 void * kernel_abort( void ) __attribute__(( __nothrow__, __leaf__, __weak__ )) { return 0p; }
-void kernel_abort_msg( void * data, char * buffer, int size ) __attribute__(( __nothrow__, __leaf__, __weak__ )) {}
+void kernel_abort_msg( void * data, char buffer[], int size ) __attribute__(( __nothrow__, __leaf__, __weak__ )) {}
 // See concurrency/kernel.cfa for strong definition used in multi-processor mode.
 int kernel_abort_lastframe( void ) __attribute__(( __nothrow__, __leaf__, __weak__ )) { return 4; }
@@ -228 +229 @@
         __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
 
-        if ( fmt ) {
-                va_list args;
-                va_start( args, fmt );
-
-                len = vsnprintf( abort_text, abort_text_size, fmt, args );
-                va_end( args );
-                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
-
-                if ( fmt[strlen( fmt ) - 1] != '\n' ) {                 // add optional newline if missing at the end of the format text
-                        __cfaabi_dbg_write( "\n", 1 );
-                }
+        assert( fmt );
+        va_list args;
+        va_start( args, fmt );
+
+        len = vsnprintf( abort_text, abort_text_size, fmt, args );
+        va_end( args );
+        __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
+
+        if ( fmt[strlen( fmt ) - 1] != '\n' ) {                 // add optional newline if missing at the end of the format text
+                __cfaabi_dbg_write( "\n", 1 );
         }