Skip to content

fix(giop): use Latin-1 charset to encode op name #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ngmr merged 1 commit into from
Feb 25, 2026
Merged

fix(giop): use Latin-1 charset to encode op name #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package org.apache.yoko.orb.OB;

import org.apache.yoko.io.Buffer;
import org.apache.yoko.orb.CORBA.YokoOutputStream;
import org.apache.yoko.orb.CORBA.OutputStreamHolder;
import org.apache.yoko.orb.CORBA.YokoOutputStream;
import org.apache.yoko.orb.IOP.ServiceContexts;
import org.apache.yoko.orb.OBPortableServer.POAManager_impl;
import org.apache.yoko.orb.OCI.Connector;
Expand Down Expand Up @@ -49,7 +49,6 @@
import static java.util.logging.Level.FINE;
import static java.util.logging.Level.FINEST;
import static org.apache.yoko.logging.VerboseLogging.CONN_OUT_LOG;
import static org.apache.yoko.orb.OB.CodeSetInfo.ISO_LATIN_1;
import static org.apache.yoko.orb.OB.CodeSetUtil.getNegotiatedCodecs;
import static org.apache.yoko.orb.OB.SendingContextRuntimes.SENDING_CONTEXT_RUNTIME;
import static org.apache.yoko.orb.exceptions.Transients.ACTIVE_CONNECTION_MANAGEMENT;
Expand Down
9 changes: 7 additions & 2 deletions yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPOutgoingMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
import org.omg.IOP.ServiceContext;
import org.omg.IOP.TaggedProfile;
import org.omg.IOP.TaggedProfileHelper;
import sun.nio.cs.ISO_8859_1;

import java.nio.charset.StandardCharsets;

import static java.nio.charset.StandardCharsets.ISO_8859_1;

public final class GIOPOutgoingMessage {
private static int maxMessageSize_ = 0; // TODO: pick a default
Expand Down Expand Up @@ -171,7 +176,7 @@ void writeRequestHeader(int id, String op, boolean response, ServiceContexts con
//
int opLen = op.length();
out_.write_ulong(opLen + 1);
out_.write_octet_array(op.getBytes(), 0, opLen);
out_.write_octet_array(op.getBytes(ISO_8859_1), 0, opLen);
out_.write_octet((byte) 0); // nul terminator

out_.write_ulong(0); // requesting_principal
Expand Down Expand Up @@ -209,7 +214,7 @@ void writeRequestHeader(int id, String op, boolean response, ServiceContexts con
//
int opLen = op.length();
out_.write_ulong(opLen + 1);
out_.write_octet_array(op.getBytes(), 0, opLen);
out_.write_octet_array(op.getBytes(ISO_8859_1), 0, opLen);
out_.write_octet((byte) 0); // nul terminator

writeServiceContextList(contexts); // service_context
Expand Down