Fixed uninitialised memory read in file open ops.

git-svn-id: https://svn.parrot.org/parrot/trunk@1336 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
fernandobrito · Apr 14, 2002 · 45ab06a · 45ab06a
1 parent 1b6c5da
commit 45ab06a
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 12 deletions.
diff --git a/core.ops b/core.ops
@@ -135,7 +135,7 @@ descriptor into $1.
 =cut
 
 inline op open(out INT, in STR) {
-  $1 = (INTVAL)fopen(($2)->bufstart, "r+");
+  $1 = (INTVAL)fopen(string_to_cstring(interpreter, ($2)), "r+");
   if (!$1) {
     perror("Can't open");
     exit(1);
@@ -145,7 +145,7 @@ inline op open(out INT, in STR) {
 }
 
 inline op open(out INT, in STR, in STR) {
-  $1 = (INTVAL)fopen(($2)->bufstart, ($3)->bufstart);
+  $1 = (INTVAL)fopen(string_to_cstring(interpreter, ($2)), string_to_cstring(interpreter, ($3)));
   goto NEXT();
 }
 
@@ -246,7 +246,7 @@ inline op print(in NUM) {
 op print(in STR) {
   STRING *s = $1;
   if (s && string_length(s)) {
-    printf("%.*s", (int)string_length(s), (char *) s->bufstart);
+    printf("%s", string_to_cstring(interpreter, (s)));
   }
   goto NEXT();
 }
@@ -255,7 +255,7 @@ op print(in PMC) {
   PMC *p = $1;
   STRING *s = (p->vtable->get_string(interpreter, p));
   if (s) {
-    printf("%.*s",(int)string_length(s),(char *) s->bufstart);
+    printf("%s", string_to_cstring(interpreter, (s)));
   }
   goto NEXT();
 }
@@ -304,7 +304,7 @@ op print(in INT, in STR) {
 	default: file = (FILE *)$1;
   }
   if (s && string_length(s)) {
-    fprintf(file, "%.*s",(int)string_length(s),(char *) s->bufstart);
+    fprintf(file, "%s", string_to_cstring(interpreter, (s)));
   }
   goto NEXT();
 }
@@ -323,7 +323,7 @@ op print(in INT, in PMC) {
 	default: file = (FILE *)$1;
   }
   if (s) {
-    fprintf(file, "%.*s",(int)string_length(s),(char *) s->bufstart);
+    fprintf(file, "%s", string_to_cstring(interpreter, (s)));
   }
   goto NEXT();
 }

diff --git a/include/parrot/string_funcs.h b/include/parrot/string_funcs.h
@@ -27,6 +27,7 @@ STRING *Parrot_string_replace(Parrot, STRING *, INTVAL, INTVAL,
                              const STRING *, STRING **);
 INTVAL Parrot_string_compare(Parrot, const STRING *, const STRING *);
 Parrot_Bool Parrot_string_bool(const STRING *);
+const char *Parrot_string_cstring(const STRING *);
 
 /* Declarations of other functions */
 UINTVAL Parrot_string_length(const STRING *);
@@ -45,6 +46,7 @@ STRING *Parrot_string_transcode(struct Parrot_Interp *, const STRING *src,
                                 STRING **dest_ptr);
 void Parrot_string_init(void);
 INTVAL Parrot_string_index(const STRING *, UINTVAL idx);
+const char *Parrot_string_to_cstring(struct Parrot_Interp *, STRING *);
 
 #ifdef PARROT_IN_CORE
 
@@ -56,6 +58,7 @@ INTVAL Parrot_string_index(const STRING *, UINTVAL idx);
 #define string_replace          Parrot_string_replace
 #define string_compare          Parrot_string_compare
 #define string_bool             Parrot_string_bool
+#define string_cstring          Parrot_string_cstring
 
 #define string_length           Parrot_string_length
 #define string_ord              Parrot_string_ord
@@ -69,6 +72,7 @@ INTVAL Parrot_string_index(const STRING *, UINTVAL idx);
 #define string_transcode        Parrot_string_transcode
 #define string_init             Parrot_string_init
 #define string_index            Parrot_string_index
+#define string_to_cstring       Parrot_string_to_cstring
 
 #endif
 

diff --git a/ops/core.ops b/ops/core.ops
@@ -135,7 +135,7 @@ descriptor into $1.
 =cut
 
 inline op open(out INT, in STR) {
-  $1 = (INTVAL)fopen(($2)->bufstart, "r+");
+  $1 = (INTVAL)fopen(string_to_cstring(interpreter, ($2)), "r+");
   if (!$1) {
     perror("Can't open");
     exit(1);
@@ -145,7 +145,7 @@ inline op open(out INT, in STR) {
 }
 
 inline op open(out INT, in STR, in STR) {
-  $1 = (INTVAL)fopen(($2)->bufstart, ($3)->bufstart);
+  $1 = (INTVAL)fopen(string_to_cstring(interpreter, ($2)), string_to_cstring(interpreter, ($3)));
   goto NEXT();
 }
 
@@ -246,7 +246,7 @@ inline op print(in NUM) {
 op print(in STR) {
   STRING *s = $1;
   if (s && string_length(s)) {
-    printf("%.*s", (int)string_length(s), (char *) s->bufstart);
+    printf("%s", string_to_cstring(interpreter, (s)));
   }
   goto NEXT();
 }
@@ -255,7 +255,7 @@ op print(in PMC) {
   PMC *p = $1;
   STRING *s = (p->vtable->get_string(interpreter, p));
   if (s) {
-    printf("%.*s",(int)string_length(s),(char *) s->bufstart);
+    printf("%s", string_to_cstring(interpreter, (s)));
   }
   goto NEXT();
 }
@@ -304,7 +304,7 @@ op print(in INT, in STR) {
 	default: file = (FILE *)$1;
   }
   if (s && string_length(s)) {
-    fprintf(file, "%.*s",(int)string_length(s),(char *) s->bufstart);
+    fprintf(file, "%s", string_to_cstring(interpreter, (s)));
   }
   goto NEXT();
 }
@@ -323,7 +323,7 @@ op print(in INT, in PMC) {
 	default: file = (FILE *)$1;
   }
   if (s) {
-    fprintf(file, "%.*s",(int)string_length(s),(char *) s->bufstart);
+    fprintf(file, "%s", string_to_cstring(interpreter, (s)));
   }
   goto NEXT();
 }

diff --git a/src/string.c b/src/string.c
@@ -802,6 +802,21 @@ string_from_int(struct Parrot_Interp * interpreter, INTVAL i) {
                             NULL, 0, NULL);
 }
 
+const char *
+string_to_cstring(struct Parrot_Interp * interpreter, STRING * s)
+{
+    char *cstring;
+
+    if (s->buflen == s->bufused)
+        string_grow(interpreter, s, 1);
+
+    cstring = s->bufstart;
+
+    cstring[s->bufused] = 0;
+
+    return cstring;
+}
+
 
 /*
  * Local variables:

diff --git a/string.c b/string.c
@@ -802,6 +802,21 @@ string_from_int(struct Parrot_Interp * interpreter, INTVAL i) {
                             NULL, 0, NULL);
 }
 
+const char *
+string_to_cstring(struct Parrot_Interp * interpreter, STRING * s)
+{
+    char *cstring;
+
+    if (s->buflen == s->bufused)
+        string_grow(interpreter, s, 1);
+
+    cstring = s->bufstart;
+
+    cstring[s->bufused] = 0;
+
+    return cstring;
+}
+
 
 /*
  * Local variables: