assembler: Error if extra args are present in pragmas (#5400)

algorand · May 19, 2023 · 5e1f8a2 · 5e1f8a2
1 parent b376efd
commit 5e1f8a2
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 7 deletions.
diff --git a/data/transactions/logic/assembler.go b/data/transactions/logic/assembler.go
@@ -2193,6 +2193,9 @@ func pragma(ops *OpStream, tokens []string) error {
 		if len(tokens) < 3 {
 			return ops.error("no version value")
 		}
+		if len(tokens) > 3 {
+			return ops.errorf("unexpected extra tokens: %s", strings.Join(tokens[3:], " "))
+		}
 		value := tokens[2]
 		var ver uint64
 		if ops.pending.Len() > 0 {
@@ -2222,6 +2225,9 @@ func pragma(ops *OpStream, tokens []string) error {
 		if len(tokens) < 3 {
 			return ops.error("no typetrack value")
 		}
+		if len(tokens) > 3 {
+			return ops.errorf("unexpected extra tokens: %s", strings.Join(tokens[3:], " "))
+		}
 		value := tokens[2]
 		on, err := strconv.ParseBool(value)
 		if err != nil {

diff --git a/data/transactions/logic/assembler_test.go b/data/transactions/logic/assembler_test.go
@@ -2325,6 +2325,26 @@ func TestPragmas(t *testing.T) {
 
 	ops = testProg(t, "    #pragma version 5     ", assemblerNoVersion)
 	require.Equal(t, uint64(5), ops.Version)
+
+	testProg(t, "#pragma version 5 blah", assemblerNoVersion,
+		Expect{1, "unexpected extra tokens: blah"})
+
+	testProg(t, "#pragma typetrack", assemblerNoVersion,
+		Expect{1, "no typetrack value"})
+
+	testProg(t, "#pragma typetrack blah", assemblerNoVersion,
+		Expect{1, `bad #pragma typetrack: "blah"`})
+
+	testProg(t, "#pragma typetrack false blah", assemblerNoVersion,
+		Expect{1, "unexpected extra tokens: blah"})
+
+	// Currently pragmas don't treat semicolons as newlines. It would probably
+	// be nice to fix this.
+	testProg(t, "#pragma version 5; int 1", assemblerNoVersion,
+		Expect{1, "unexpected extra tokens: ; int 1"})
+
+	testProg(t, "#pragma typetrack false; int 1", assemblerNoVersion,
+		Expect{1, "unexpected extra tokens: ; int 1"})
 }
 
 func TestAssemblePragmaVersion(t *testing.T) {

diff --git a/data/txntest/txn.go b/data/txntest/txn.go
@@ -182,8 +182,7 @@ func assemble(source interface{}) []byte {
 		}
 		ops, err := logic.AssembleString(program)
 		if err != nil {
-			fmt.Printf("Bad program %v", ops.Errors)
-			panic(ops.Errors)
+			panic(fmt.Sprintf("Bad program %v", ops.Errors))
 		}
 		return ops.Program
 	case []byte:

diff --git a/ledger/simulation/simulation_eval_test.go b/ledger/simulation/simulation_eval_test.go
@@ -867,7 +867,7 @@ func TestAppCallWithExtraBudget(t *testing.T) {
 			Sender:            sender.Addr,
 			ApplicationID:     0,
 			ApprovalProgram:   expensiveAppSource,
-			ClearStateProgram: `#pragma version 6; int 0`,
+			ClearStateProgram: "#pragma version 6\nint 0",
 		})
 		// Expensive 700 repetition of int 1 and pop total cost 1404
 		expensiveTxn := env.TxnInfo.NewTxn(txntest.Txn{
@@ -938,7 +938,7 @@ func TestAppCallWithExtraBudgetOverBudget(t *testing.T) {
 			Sender:            sender.Addr,
 			ApplicationID:     0,
 			ApprovalProgram:   expensiveAppSource,
-			ClearStateProgram: `#pragma version 6; int 0`,
+			ClearStateProgram: "#pragma version 6\nint 0",
 		})
 		// Expensive 700 repetition of int 1 and pop total cost 1404
 		expensiveTxn := env.TxnInfo.NewTxn(txntest.Txn{
@@ -1015,7 +1015,7 @@ func TestAppCallWithExtraBudgetExceedsInternalLimit(t *testing.T) {
 		Sender:            sender.Addr,
 		ApplicationID:     0,
 		ApprovalProgram:   expensiveAppSource,
-		ClearStateProgram: `#pragma version 6; int 0`,
+		ClearStateProgram: "#pragma version 6\nint 0",
 	})
 	// Expensive 700 repetition of int 1 and pop total cost 1404
 	expensiveTxn := env.TxnInfo.NewTxn(txntest.Txn{

diff --git a/netdeploy/remote/deployedNetwork.go b/netdeploy/remote/deployedNetwork.go
@@ -757,7 +757,7 @@ func createSignedTx(src basics.Address, round basics.Round, params config.Consen
 			return []transactions.SignedTxn{}, err
 		}
 		approval := ops.Program
-		ops, err = logic.AssembleString("#pragma version 2 int 1")
+		ops, err = logic.AssembleString("#pragma version 2\nint 1")
 		if err != nil {
 			panic(err)
 		}

diff --git a/test/e2e-go/restAPI/restClient_test.go b/test/e2e-go/restAPI/restClient_test.go
@@ -1907,7 +1907,7 @@ int 1`
 	ops, err := logic.AssembleString(prog)
 	a.NoError(err)
 	approval := ops.Program
-	ops, err = logic.AssembleString("#pragma version 8; int 1")
+	ops, err = logic.AssembleString("#pragma version 8\nint 1")
 	a.NoError(err)
 	clearState := ops.Program