
<     for (i = 0; i < cinfo->num_components; i++)
<         cinfo->cur_comp_info[i] = NULL;
---
>     for (i = 0; i < MIN(cinfo->num_components, MAX_COMPS_IN_SCAN); i++)
>         cinfo->cur_comp_info[i] = NULL;
