@@ -111,8 +111,18 @@ Pvoid_t read_parameters() { Pvoid_t params = NULL; unsigned int len, bytes = 0; - if (!fscanf(stdin, "%u\n", &len)) + unsigned char tmp; + + if (!fscanf(stdin, "%u", &len)) die("Couldn't parse parameter set size"); + /* Read a newline after the size spec. Earlier I did + * fscanf(stdin, "%u\n", &len) + * on the line above, but this was a stupid idea. Fscanf interpretes + * *any* whitespace character as a sign to read *any number* of + * following whitespace characters, which obviously caused great havoc + * here. + * */ + fread(&tmp, 1, 1, stdin); while (bytes < len){ p_entry *key = read_netstr_entry(&bytes); p_entry *val = read_netstr_entry(&bytes); ext/disco.c 7f6963f8301855f12c920d31128f66fb16bf0267 Ville Tuulos tuulos@nxfront.nokiapaloalto.com http://github.com/tuulos/disco/commit/c00bbeeb752829efd6450f310adc9b25e6e8bc37 c00bbeeb752829efd6450f310adc9b25e6e8bc37 2008-07-12T16:08:30-07:00 2008-07-12T16:08:30-07:00 fixed a fatal bug in disco.c -- in some cases read_parameters() would read too many bytes, which broke everything 15023d44d8342ec2386e3356a8983955d7f72d12 Ville Tuulos tuulos@nxfront.nokiapaloalto.com