Codebase list tigr-glimmer / 0e1938c debian / patches / mayhem.patch
0e1938c

Tree @0e1938c (Download .tar.gz)

mayhem.patch @0e1938c — raw · history · blame 

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
Author: Andreas Tille <tille@debian.org>
Last-Update: Mon, 14 Dec 2015 16:44:19 +0100
Bug-Debian: http://bugs.debian.org/715701,
            http://bugs.debian.org/715702
Description: Fix crashes reported by Mayhem
 See http://www.drpaulcarter.com/cs/common-c-errors.php#4.1
 to make fgetc() more safe.  However, the original problem is
 that for empty strings no space at all is allocated.  This is
 now done in advance.

--- a/src/ICM/build-fixed.cc
+++ b/src/ICM/build-fixed.cc
@@ -234,20 +234,24 @@ static int  Read_String
   {
    int  ch, ct;
 
-   while  ((ch = fgetc (fp)) != EOF && ch != '>')
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '>'))
      ;
 
    if  (ch == EOF)
        return  FALSE;
 
    ct = 0;
-   while  ((ch = fgetc (fp)) != EOF && ch != '\n' && isspace (ch))
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '\n') && isspace (ch))
      ;
    if  (ch == EOF)
        return  FALSE;
-   if  (ch != '\n' && ! isspace (ch))
+   if  (ch != ((int) '\n') && ! isspace (ch))
        ungetc (ch, fp);
-   while  ((ch = fgetc (fp)) != EOF && ch != '\n')
+   if (tag_size == 0 ) {
+       tag_size += INCR_SIZE;
+       tag = (char *) Safe_realloc (tag, tag_size);
+   }
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '\n'))
      {
       if  (ct >= tag_size - 1)
           {
@@ -259,7 +263,11 @@ static int  Read_String
    tag [ct ++] = '\0';
 
    ct = 0;
-   while  ((ch = fgetc (fp)) != EOF && ch != '>')
+   if (s_size == 0) {
+      s_size += INCR_SIZE;
+      s = (char *) Safe_realloc (s, s_size);
+   }
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '>'))
      {
       if  (isspace (ch))
           continue;
--- a/src/ICM/build-icm.cc
+++ b/src/ICM/build-icm.cc
@@ -271,20 +271,24 @@ static int  Read_String
   {
    int  ch, ct;
 
-   while  ((ch = fgetc (fp)) != EOF && ch != '>')
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '>'))
      ;
 
    if  (ch == EOF)
        return  FALSE;
 
    ct = 0;
-   while  ((ch = fgetc (fp)) != EOF && ch != '\n' && isspace (ch))
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '\n') && isspace (ch))
      ;
    if  (ch == EOF)
        return  FALSE;
    if  (ch != '\n' && ! isspace (ch))
        ungetc (ch, fp);
-   while  ((ch = fgetc (fp)) != EOF && ch != '\n')
+   if (tag_size == 0) {
+       tag_size += INCR_SIZE;
+       tag = (char *) Safe_realloc (tag, tag_size);
+   }
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '\n'))
      {
       if  (ct >= tag_size - 1)
           {
@@ -296,7 +300,11 @@ static int  Read_String
    tag [ct ++] = '\0';
 
    ct = 0;
-   while  ((ch = fgetc (fp)) != EOF && ch != '>')
+   if (s_size == 0) {
+       s_size += INCR_SIZE;
+       s = (char *) Safe_realloc (s, s_size);
+   }
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '>'))
      {
       if  (isspace (ch))
           continue;
--- a/src/ICM/score-fixed.cc
+++ b/src/ICM/score-fixed.cc
@@ -163,20 +163,24 @@ int  Read_String
   {
    int  ch, ct;
 
-   while  ((ch = fgetc (fp)) != EOF && ch != '>')
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '>'))
      ;
 
    if  (ch == EOF)
        return  FALSE;
 
    ct = 0;
-   while  ((ch = fgetc (fp)) != EOF && ch != '\n' && isspace (ch))
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '\n') && isspace (ch))
      ;
    if  (ch == EOF)
        return  FALSE;
    if  (ch != '\n' && ! isspace (ch))
        ungetc (ch, fp);
-   while  ((ch = fgetc (fp)) != EOF && ch != '\n')
+   if (tag_size == 0 ) {
+       tag_size += INCR_SIZE;
+       tag = (char *) Safe_realloc (tag, tag_size);
+   }
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '\n'))
      {
       if  (ct >= tag_size - 1)
           {
@@ -188,7 +192,11 @@ int  Read_String
    tag [ct ++] = '\0';
 
    ct = 0;
-   while  ((ch = fgetc (fp)) != EOF && ch != '>')
+   if (s_size == 0) {
+      s_size += INCR_SIZE;
+      s = (char *) Safe_realloc (s, s_size);
+   }
+   while  ((ch = fgetc (fp)) != EOF && ch != ((int) '>'))
      {
       if  (isspace (ch))
           continue;