Adjust input buffer pointer for output buffer overflow.
authordrepper <drepper>
Wed, 15 Apr 1998 16:55:45 +0000 (16:55 +0000)
committerdrepper <drepper>
Wed, 15 Apr 1998 16:55:45 +0000 (16:55 +0000)
iconvdata/euccn.c
iconvdata/eucjp.c
iconvdata/euckr.c
iconvdata/euctw.c
iconvdata/iso646.c
iconvdata/iso6937.c
iconvdata/iso8859-1.c
iconvdata/johab.c
iconvdata/sjis.c
iconvdata/t61.c
iconvdata/uhc.c

index e8d9097..f683836 100644 (file)
@@ -163,6 +163,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  ++cnt;
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -212,6 +213,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  cnt += sizeof (wchar_t);
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars + extra < data->outbufsize)
index 4e82904..e6a71cc 100644 (file)
@@ -180,6 +180,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  ++cnt;
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -256,6 +257,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  cnt += sizeof (wchar_t);
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars + extra < data->outbufsize)
index 1dfa42d..2ad9478 100644 (file)
@@ -182,6 +182,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  ++cnt;
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -226,6 +227,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  cnt += sizeof (wchar_t);
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars + extra < data->outbufsize)
index f38db47..fd422c1 100644 (file)
@@ -180,6 +180,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  ++cnt;
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -252,6 +253,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  cnt += sizeof (wchar_t);
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars + extra < data->outbufsize)
index a9705f0..53ca76c 100644 (file)
@@ -195,6 +195,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                }
            out_from:
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -243,6 +244,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                }
            out_to:
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars < data->outbufsize)
index 30c3831..21e3ab4 100644 (file)
@@ -492,6 +492,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  ++cnt;
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -593,6 +594,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  cnt += sizeof (wchar_t);
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars + extra < data->outbufsize)
index ab69c4d..b9484a0 100644 (file)
@@ -104,6 +104,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  ++cnt;
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -129,6 +130,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  cnt += sizeof (wchar_t);
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars < data->outbufsize)
index 51b235c..c9912a7 100644 (file)
@@ -408,6 +408,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  ++cnt;
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -462,6 +463,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  cnt += sizeof (wchar_t);
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars + extra < data->outbufsize)
index 7a81c01..33dc2f1 100644 (file)
@@ -4128,6 +4128,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  ++cnt;
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -4181,6 +4182,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  cnt += sizeof (wchar_t);
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars + extra < data->outbufsize)
index d532438..b77ee71 100644 (file)
@@ -483,6 +483,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  ++cnt;
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -542,6 +543,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  cnt += sizeof (wchar_t);
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars + extra < data->outbufsize)
index c1d5a40..ed4b7ad 100644 (file)
@@ -2775,6 +2775,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  ++cnt;
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outwchars;
            }
          else
@@ -2816,6 +2817,7 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
                  cnt += sizeof (wchar_t);
                }
              *inbufsize -= cnt;
+             inbuf += cnt;
              data->outbufavail = outchars;
 
              if (outchars + extra < data->outbufsize)