Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2014-07-22 06:57:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab" Changes: -------- --- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2014-07-12 17:14:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2014-07-22 09:55:48.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jul 18 09:30:33 UTC 2014 - [email protected] + +- Add scilab-fileio-hang-with-incorrect-format.patch to fix + scilab becoming unresponsive when incorrect format is specified + for mfscanf; patch came from upstream; fixes + http://bugzilla.scilab.org/13468. + +------------------------------------------------------------------- New: ---- scilab-fileio-hang-with-incorrect-format.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.AfdT3i/_old 2014-07-22 09:55:51.000000000 +0200 +++ /var/tmp/diff_new_pack.AfdT3i/_new 2014-07-22 09:55:51.000000000 +0200 @@ -54,6 +54,8 @@ Patch16: scilab-fix-arpack-detection.patch # PATCH-FIX-UPSTREAM scilab-intg-crash.patch [email protected] -- Fix scilab crash when intg involved division by zero; patch came from upstream Patch17: scilab-intg-crash.patch +# PATCH-FIX-UPSTREAM scilab-fileio-hang-with-incorrect-format.patch [email protected] -- Fix scilab becoming unresponsive when incorrect format is specified for mfscanf; patch came from upstream, fixes http://bugzilla.scilab.org/13468 +Patch18: scilab-fileio-hang-with-incorrect-format.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -285,6 +287,7 @@ %patch15 -p1 %patch16 -p1 %patch17 -p2 +%patch18 -p2 # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml ++++++ scilab-fileio-hang-with-incorrect-format.patch ++++++ X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Ffileio%2Fsrc%2Fc%2Fdo_xxscanf.c;h=e4b1be4c22adbd8f9b0b1628e14a94e76893f474;hp=969be74f3e2ab0f0618bd1e3b51e0a470f835a4f;hb=70f49342c5384aab56fd497c63a6b71fd99fd14c;hpb=350cde63b99c795a82ccab4f0e937583a1a8c81a diff --git a/scilab/modules/fileio/src/c/do_xxscanf.c b/scilab/modules/fileio/src/c/do_xxscanf.c index 969be74..e4b1be4 100644 --- a/scilab/modules/fileio/src/c/do_xxscanf.c +++ b/scilab/modules/fileio/src/c/do_xxscanf.c @@ -387,6 +387,12 @@ int do_xxscanf(char *fname, FILE * fp, char *format, int *nargs, char *strv, int ptrtab[90], ptrtab[91], ptrtab[92], ptrtab[93], ptrtab[94], ptrtab[95], ptrtab[96], ptrtab[97], ptrtab[98], ptrtab[MAXSCAN - 1]); + if (*retval == 0) + { + Scierror(998, _("%s: An error occurred: Requested type does not match data type.\n"), fname); + return RET_BUG; + } + *nargs = Min(num_conversion + 1, Max(*retval + n_directive_count, 0)); for (i = 1; i <= *nargs; i++) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
