Changeset 63b86a in git

Timestamp:

Nov 7, 2017, 4:43:05 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7dddf4eb3377f8defb3c97c3ae60284cc10eecc1

Parents:

bff7f67068c5483085ae260c59ab1b6cbe1d1bb7

Message:

fix: minor memory leak in string constants (grammar.y)

Location:

Singular

Files:

• grammar.cc (modified) (21 diffs)
• grammar.y (modified) (2 diffs)

Singular/grammar.cc

@@ -756 +756 @@
     1130,  1138,  1150,  1167,  1187,  1191,  1195,  1200,  1204,  1208,
     1212,  1216,  1221,  1227,  1233,  1239,  1245,  1251,  1257,  1269,
-    1276,  1280,  1317,  1324,  1329,  1342,  1348,  1348,  1351,  1419,
-    1423,  1452,  1465,  1482,  1491,  1496,  1504,  1516,  1535,  1545,
-    1564,  1587,  1593,  1605,  1611
+    1276,  1280,  1317,  1324,  1329,  1342,  1349,  1349,  1352,  1420,
+    1424,  1453,  1466,  1483,  1492,  1497,  1505,  1517,  1536,  1546,
+    1565,  1588,  1594,  1606,  1612
 };
 #endif
@@ -3608 +3608 @@
 /* Line 1464 of yacc.c  */
 #line 1114 "grammar.y"
-    { newFile((yyvsp[(2) - (2)].name)); ;}
+    { newFile((yyvsp[(2) - (2)].name)); omFree((yyvsp[(2) - (2)].name)); ;}
     break;
 
@@ -3946 +3946 @@
     {
             if (((yyvsp[(1) - (2)].i)!=LIB_CMD)||(jjLOAD((yyvsp[(2) - (2)].name),TRUE))) YYERROR;
+            omFree((yyvsp[(2) - (2)].name));
           ;}
     break;
@@ -3952 +3953 @@
 
 /* Line 1464 of yacc.c  */
-#line 1352 "grammar.y"
+#line 1353 "grammar.y"
     {
             if (((yyvsp[(1) - (2)].i)==KEEPRING_CMD) && (myynest==0))
@@ -4022 +4023 @@
 
 /* Line 1464 of yacc.c  */
-#line 1420 "grammar.y"
+#line 1421 "grammar.y"
     {
             type_cmd(&((yyvsp[(2) - (2)].lv)));
@@ -4031 +4032 @@
 
 /* Line 1464 of yacc.c  */
-#line 1424 "grammar.y"
+#line 1425 "grammar.y"
     {
             //Print("typ is %d, rtyp:%d\n",$1.Typ(),$1.rtyp);
@@ -4059 +4060 @@
 
 /* Line 1464 of yacc.c  */
-#line 1453 "grammar.y"
+#line 1454 "grammar.y"
     {
             int i; TESTSETINT((yyvsp[(3) - (5)].lv),i);
@@ -4077 +4078 @@
 
 /* Line 1464 of yacc.c  */
-#line 1466 "grammar.y"
+#line 1467 "grammar.y"
     {
             if (currentVoice->ifsw==1)
@@ -4099 +4100 @@
 
 /* Line 1464 of yacc.c  */
-#line 1483 "grammar.y"
+#line 1484 "grammar.y"
     {
             int i; TESTSETINT((yyvsp[(3) - (5)].lv),i);
@@ -4113 +4114 @@
 
 /* Line 1464 of yacc.c  */
-#line 1492 "grammar.y"
+#line 1493 "grammar.y"
     {
             if (exitBuffer(BT_break)) YYERROR;
@@ -4123 +4124 @@
 
 /* Line 1464 of yacc.c  */
-#line 1497 "grammar.y"
+#line 1498 "grammar.y"
     {
             if (contBuffer(BT_break)) YYERROR;
@@ -4133 +4134 @@
 
 /* Line 1464 of yacc.c  */
-#line 1505 "grammar.y"
+#line 1506 "grammar.y"
     {
             /* -> if(!$2) break; $3; continue;*/
@@ -4147 +4148 @@
 
 /* Line 1464 of yacc.c  */
-#line 1517 "grammar.y"
+#line 1518 "grammar.y"
     {
             /* $2 */
@@ -4168 +4169 @@
 
 /* Line 1464 of yacc.c  */
-#line 1536 "grammar.y"
+#line 1537 "grammar.y"
     {
             idhdl h = enterid((yyvsp[(2) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE);
@@ -4183 +4184 @@
 
 /* Line 1464 of yacc.c  */
-#line 1546 "grammar.y"
+#line 1547 "grammar.y"
     {
             idhdl h = enterid((yyvsp[(1) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE);
@@ -4207 +4208 @@
 
 /* Line 1464 of yacc.c  */
-#line 1565 "grammar.y"
+#line 1566 "grammar.y"
     {
             omFree((ADDRESS)(yyvsp[(3) - (4)].name));
@@ -4232 +4233 @@
 
 /* Line 1464 of yacc.c  */
-#line 1588 "grammar.y"
+#line 1589 "grammar.y"
     {
             // decl. of type proc p(int i)
@@ -4243 +4244 @@
 
 /* Line 1464 of yacc.c  */
-#line 1594 "grammar.y"
+#line 1595 "grammar.y"
     {
             // decl. of type proc p(i)
@@ -4257 +4258 @@
 
 /* Line 1464 of yacc.c  */
-#line 1606 "grammar.y"
+#line 1607 "grammar.y"
     {
             iiRETURNEXPR.Copy(&(yyvsp[(3) - (4)].lv));
@@ -4268 +4269 @@
 
 /* Line 1464 of yacc.c  */
-#line 1612 "grammar.y"
+#line 1613 "grammar.y"
     {
             if ((yyvsp[(1) - (3)].i)==RETURN)
@@ -4282 +4283 @@
 
 /* Line 1464 of yacc.c  */
-#line 4283 "grammar.cc"
+#line 4284 "grammar.cc"
       default: break;
     }

Singular/grammar.y

@@ -1112 +1112 @@
 filecmd:
         '<' stringexpr
-          { newFile($2); }
+          { newFile($2); omFree($2); }
         ;
 
@@ -1343 +1343 @@
           {
             if (($1!=LIB_CMD)||(jjLOAD($2,TRUE))) YYERROR;
+            omFree($2);
           }
         ;