search for: tftp_opts

...* found no final null */ + /* * Parse option pointed to by options; guaranteed to be null-terminated */ @@ -944,8 +940,10 @@ static void pxe_searchdir(char *filename, struct file *file) do { tftp_opt = tftp_options; for (i = 0; i < tftp_opts; i++) { - if (!strncmp(p, tftp_opt->str_ptr,tftp_opt->str_len)) + if (!strncmp(p, tftp_opt->str_ptr,tftp_opt->str_len)) { + buffersize -= tftp_opt->str_len; break; + } tftp_opt++;...

...ffersize) + goto done; /* found no final null */ + } + + /* + * Parse option pointed to by options; guaranteed to be null-terminated + */ + p = options; tftp_opt = tftp_options; for (i = 0; i < tftp_opts; i++) { if (!strncmp(p, tftp_opt->str_ptr,tftp_opt->str_len)) -- 1.5.6.rc0 -- regards liu Aleaxander

A fancy pointers logic has been replaced with a plain old if / else branches. It was assigning only half of a 64 bits integer which is then assigned to a size_t. Thus leading to a bug on platform where size_t is 64 bits. Resolves bug #26 Signed-off-by: Celelibi <celelibi at gmail.com> --- Not sure if genec already issued a pull request for this patch or not. Anyway, here it is as