Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jcodings
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0cc8cedd3fc0
Choose a base ref
...
head repository: jruby/jcodings
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2592804fa5a5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 25, 2016

  1. Fixed bad array copy source.

    nirvdrum committed Jul 25, 2016
    Copy the full SHA
    19ce264 View commit details
  2. Merge pull request #17 from nirvdrum/fix_array_copy_source

    Fixed bad array copy source.
    lopex authored Jul 25, 2016
    Copy the full SHA
    2592804 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/org/jcodings/transcode/EConv.java
4 changes: 2 additions & 2 deletions src/org/jcodings/transcode/EConv.java
Original file line number Diff line number Diff line change
@@ -331,7 +331,7 @@ private EConvResult convertInternal(byte[] in, Ptr inPtr, int inStop, byte[] out
if (inBuf.bytes != null && inBuf.dataStart != inBuf.dataEnd) {
if (outStop - outPtr.p < inBuf.dataEnd - inBuf.dataStart) {
len = outStop - outPtr.p;
System.arraycopy(inBuf, inBuf.dataStart, out, outPtr.p, len);
System.arraycopy(inBuf.bytes, inBuf.dataStart, out, outPtr.p, len);
outPtr.p = outStop;
inBuf.dataStart += len;
return convertInternalResult(EConvResult.DestinationBufferFull, null);
@@ -884,4 +884,4 @@ private static boolean memcmp(byte[] a, byte[] b, int len) {
}
return true;
}
}
}