Changeset 270

Timestamp:

Mar 3, 2011, 3:12:29 PM (14 years ago)

Author:

dmik

Message:

java_props_md.c: More GCC warnings and also fixed a wrong array subscript which could theoretically cause a failed memory access.

File:

• trunk/openjdk/jdk/src/windows/native/java/lang/java_props_md.c (modified) (4 diffs)

trunk/openjdk/jdk/src/windows/native/java/lang/java_props_md.c

@@ -26 +26 @@
 #ifdef __WIN32OS2__
 #define INCL_DOSMISC
+#define INCL_DOSNLS
 #include <os2wrap2.h>
 #endif
@@ -706 +707 @@
         sprintf(buf, "%lu.%lu", ver[0], ver[1]);
         sprops.os_version = strdup(buf);
-        sprintf(buf, "%lu", ver[3]);
+        sprintf(buf, "%lu", ver[2]);
         sprops.patch_level = strdup(buf);
 
@@ -883 +884 @@
         } else {
             char buf[100];
-            int buflen = sizeof(buf);
+            DWORD buflen = sizeof(buf);
             sprops.user_name =
                 GetUserName(buf, &buflen) ? strdup(buf) : "unknown";
@@ -988 +989 @@
                     static char encoding[16];
                     os2_ULONG cp[3], len;
-                    DosQueryCp(sizeof(cp), &cp, &len);
+                    DosQueryCp(sizeof(cp), cp, &len);
                     sprintf(encoding, "Cp%lu", cp[0]);
                     sprops.encoding =  encoding;