From: Tom Tromey <tromey@redhat.com>
Date: Tue, 11 Dec 2001 03:58:40 +0000 (+0000)
Subject: re PR libgcj/5064 (java/lang/natClassLoader.cc doesn't compile on systems without... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d12a187337e82450144973ddd957287408318050;p=gcc.git

re PR libgcj/5064 (java/lang/natClassLoader.cc doesn't compile on systems without snprintf)

	Fix for PR libgcj/5064.
	* java/lang/natClassLoader.cc: Don't include stdio.h.
	(_Jv_RegisterClassHookDefault): Don't use snprintf.

From-SVN: r47861
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 62884b86ef9..eb5742ab724 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-10  Tom Tromey  <tromey@redhat.com>
+
+	Fix for PR libgcj/5064.
+	* java/lang/natClassLoader.cc: Don't include stdio.h.
+	(_Jv_RegisterClassHookDefault): Don't use snprintf.
+
 2001-12-09  Per Bothner  <per@bothner.com>
 
 	* gnu/gcj/xlib/XImage.java (toString):  Add missing initialization.
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index c9a58726a3c..59aca071ea2 100644
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -14,7 +14,6 @@ details.  */
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #include <gcj/cni.h>
 #include <jvm.h>
@@ -463,9 +462,13 @@ _Jv_RegisterClassHookDefault (jclass klass)
 	{
 	  // If you get this, it means you have the same class in two
 	  // different libraries.
+#define TEXT "Duplicate class registration: "
+	  // We size-limit MESSAGE so that you can't trash the stack.
 	  char message[200];
-	  snprintf (&message[0], 200, "Duplicate class registration: %s",
-		    klass->name->data);
+	  strcpy (message, TEXT);
+	  strncpy (message + sizeof (TEXT) - 1, klass->name->data,
+		   sizeof (message) - sizeof (TEXT));
+	  message[sizeof (message) - 1] = '\0';
 	  if (! gcj::runtimeInitialized)
 	    JvFail (message);
 	  else