[Poppler-bugs] [Bug 84722] Attribute::getName() returns wrong value for /N when UTF-16BE is used

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=84722

--- Comment #2 from luigi.scarso at gmail.com ---
This seems to be ok



--- StructElement.h.orig    2014-10-06 21:05:53.439147479 +0200
+++ StructElement.h    2014-10-07 07:51:25.412753215 +0200
@@ -76,6 +76,9 @@
   // Creates an UserProperty attribute, with an arbitrary name and value.
   Attribute(const char *name, Object *value);

+  // Creates an UserProperty attribute, with an arbitrary name of length len
and value.
+  Attribute(const char *name, Object *value, int len);
+
   GBool isOk() const { return type != Unknown; }

   // Name, type and value can be set only on construction.
@@ -86,7 +89,7 @@
   Object *getValue() const { return &value; }
   static Object *getDefaultValue(Type type);

-  const char *getName() const { return type == UserProperty ?
name.getCString() : getTypeName(); }
+  GooString *getName() const { return type == UserProperty ? name.copy() : new
GooString(getTypeName()); }

   // The revision is optional, and defaults to zero.
   Guint getRevision() const { return revision; }



--- StructElement.cc.orig    2014-10-06 21:05:47.551147234 +0200
+++ StructElement.cc    2014-10-06 09:13:31.000000000 +0200
@@ -690,6 +690,23 @@
   valueA->copy(&value);
 }

+Attribute::Attribute(const char *nameA, Object *valueA, int lenA):
+  type(UserProperty),
+  owner(UserProperties),
+  revision(0),
+  name(nameA,lenA),
+  value(),
+  hidden(gFalse),
+  formatted(NULL)
+{
+  assert(valueA);
+  valueA->copy(&value);
+}
+
+
+
+
+
 Attribute::Attribute(Type type, Object *valueA):
   type(type),
   owner(UserProperties), // TODO: Determine corresponding owner from Type
@@ -785,13 +802,17 @@
   return entry ? entry->type : Unknown;
 }

+
 Attribute *Attribute::parseUserProperty(Dict *property)
 {
   Object obj, value;
   const char *name = NULL;
+  int len = 0 ;

-  if (property->lookup("N", &obj)->isString())
+  if (property->lookup("N", &obj)->isString()){
     name = obj.getString()->getCString();
+    len = obj.getString()->getLength();
+  }
   else if (obj.isName())
     name = obj.getName();
   else {
@@ -807,7 +828,7 @@
     return NULL;
   }

-  Attribute *attribute = new Attribute(name, &value);
+  Attribute *attribute = new Attribute(name, &value,len) ;
   value.free();
   obj.free();

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/poppler-bugs/attachments/20141007/ab705c60/attachment.html>