dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Accept what g_strescape throws at us (specifically, octal sequences that 

1999-09-02  Tor Lillqvist  <tml@iki.fi>

* plug-ins/script-fu/interp_sliba.c (lreadstring): Accept what
g_strescape throws at us (specifically, octal sequences that start
with any octal digit, and are at most three octal digits long).

* app/makefile.{cygwin,msc}: Update.
This commit is contained in:
Tor Lillqvist 1999-09-02 20:54:07 +00:00 committed by Tor Lillqvist
parent 1341c2939a
commit 5e0093547e
5 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
1999-09-02 Tor Lillqvist <tml@iki.fi>
* plug-ins/script-fu/interp_sliba.c (lreadstring): Accept what
g_strescape throws at us (specifically, octal sequences that start
with any octal digit, and are at most three octal digits long).
* app/makefile.{cygwin,msc}: Update.
Thu Sep 2 22:31:11 MEST 1999 Sven Neumann <sven@gimp.org>
* plug-ins/gap/gap_lib.[ch]

2
app/makefile.cygwin
View File

@ -154,6 +154,8 @@ gimp_OBJECTS = \
gradient_select.o \
gradient_select_cmds.o \
guides_cmds.o \
gtkwrapbox.o \
gtkhwrapbox.o \
gximage.o \
histogramwidget.o \
histogram_tool.o \

2
app/makefile.msc
View File

@ -161,6 +161,8 @@ gimp_OBJECTS = \
gradient_select.obj \
gradient_select_cmds.obj\
guides_cmds.obj \
gtkwrapbox.obj \
gtkhwrapbox.obj \
gximage.obj \
histogramwidget.obj \
histogram_tool.obj \

21
plug-ins/script-fu/interp_sliba.c
View File

@ -654,7 +654,7 @@ string_downcase (LISP str)
LISP
lreadstring (struct gen_readio * f)
{
int j, c, n;
int j, c, n, ndigits;
char *p;
j = 0;
p = tkbuffer;
@ -689,14 +689,25 @@ lreadstring (struct gen_readio * f)
c = ' ';
break;
case '0':
n = 0;
while (1)
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
n = c - '0';
ndigits = 1;
while (ndigits <= 3)
{
c = GETC_FCN (f);
if (c == EOF)
my_err ("eof after \\0", NIL);
if (isdigit (c))
n = n * 8 + c - '0';
if (c >= '0' && c <= '7')
{
n = n * 8 + c - '0';
ndigits++;
}
else
{
UNGETC_FCN (c, f);

21
plug-ins/script-fu/siod/sliba.c
View File

@ -654,7 +654,7 @@ string_downcase (LISP str)
LISP
lreadstring (struct gen_readio * f)
{
int j, c, n;
int j, c, n, ndigits;
char *p;
j = 0;
p = tkbuffer;
@ -689,14 +689,25 @@ lreadstring (struct gen_readio * f)
c = ' ';
break;
case '0':
n = 0;
while (1)
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
n = c - '0';
ndigits = 1;
while (ndigits <= 3)
{
c = GETC_FCN (f);
if (c == EOF)
my_err ("eof after \\0", NIL);
if (isdigit (c))
n = n * 8 + c - '0';
if (c >= '0' && c <= '7')
{
n = n * 8 + c - '0';
ndigits++;
}
else
{
UNGETC_FCN (c, f);