Merge pull request #4909

src/Makefile.test.include

@@ -13,7 +13,8 @@ EXTRA_DIST += \
 	test/data/tt-delout1-out.hex \
 	test/data/tt-locktime317000-out.hex \
 	test/data/tx394b54bb.hex \
-	test/data/txcreate1.hex
+	test/data/txcreate1.hex \
+	test/data/txcreate2.hex
 
 JSON_TEST_FILES = \
   test/data/script_valid.json \

src/bitcoin-tx.cpp

@@ -237,8 +237,7 @@ static void MutateTxAddOutScript(CMutableTransaction& tx, const string& strInput
     // separate VALUE:SCRIPT in string
     size_t pos = strInput.find(':');
     if ((pos == string::npos) ||
-        (pos == 0) ||
+        (pos == 0))
-        (pos == (strInput.size() - 1)))
         throw runtime_error("TX output missing separator");
 
     // extract and validate VALUE

src/test/data/bitcoin-util-test.json

@@ -34,5 +34,8 @@
      "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
      "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"],
     "output_cmp": "txcreate1.hex"
+  },
+  { "exec": ["./bitcoin-tx", "-create", "outscript=0:"],
+    "output_cmp": "txcreate2.hex"
   }
 ]

src/test/data/txcreate2.hex

@@ -0,0 +1 @@
+01000000000100000000000000000000000000