Code (obsolete) Merge Request #4: owwrite: fix writing of hex '00', which failed to write (rejected)
Merging...
Merged
Something went wrong. Please, merge manually
Checking if merge is possible...
Something went wrong. Please, merge manually
Johan Ström wants to merge 1 commit from /u/stromnet/owfs/ to master, 2015-03-11
This fix an issue with owwrite handling binary data as strings, writing hex 00 would break the string prematurely. Example transaction:
owwrite --hex /uncached/12.AD00B4D0BE42/pages/page.0 1010
Byte buffer FD, length=41
--000: 2F 75 6E 63 61 63 68 65 64 2F 31 32 2E 41 44 30
--016: 30 42 34 44 30 42 45 34 32 2F 70 61 67 65 73 2F
--032: 70 61 67 65 2E 30 00 10 10
DEBUG: ow_tcp_read.c:(113) read: 41 - 0 = 41
owwrite --hex /uncached/12.AD00B4D0BE42/pages/page.0 0000
Byte buffer FD, length=39
--000: 2F 75 6E 63 61 63 68 65 64 2F 31 32 2E 41 44 30
--016: 30 42 34 44 30 42 45 34 32 2F 70 61 67 65 73 2F
--032: 70 61 67 65 2E 30 00
Note how the last 2 (actual data) bytes are absent in the later example.
| Commit | Date | |
|---|---|---|
|
[d2f6ac]
by
owwrite: fix writing of hex '00', which failed to write For example, or anything with 00 in it, would fail, since strlen() would think |
2014-12-20 15:45:23 | Tree |
Please close this broken merge-request (seems I cannot do it myself?). Replaced with https://sourceforge.net/p/owfs/code/merge-requests/6/.
Ok, so sourceforge is behaving a bit strange.. Both MR 4 and 6 are now for the same branch, while originally it said "asked you to merge 0 commits" for some reason.
So, please merge one (or feedback if inappropriate), and close the other.. :) Thanks!