Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28901

Modified Files:
        ufraw_preview.c 
Log Message:
Prevent some crashes for invalid raw files.


Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- ufraw_preview.c     2 Dec 2009 02:30:26 -0000       1.320
+++ ufraw_preview.c     10 Dec 2009 06:10:09 -0000      1.321
@@ -5812,7 +5812,12 @@
     ufraw_load_raw(uf);
     preview_progress_disable(data);
     gtk_widget_set_sensitive(data->Controls, TRUE);
-
+    // Should only happen if ufraw_load_raw() failed:
+    if (data->UF->rgbMax == 0)
+       data->UF->rgbMax = 0xffff; // prevents division by zero
+    for (i=0; i<4; i++)
+       if (data->UF->conf->chanMul[i] < 0)
+           data->UF->conf->chanMul[i] = 1;
     /* After window size was set, the user may want to re-size it.
      * This function is called after the progress-bar text was set,
      * to make sure that there are no scroll-bars on the initial preview. */


------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs

Reply via email to