Permalink
Browse files

Ensure that `msCopyLabel` copies `expression` and `text` directives

  • Loading branch information...
1 parent 585b3e7 commit 547391d91537923e302e57d7e435d29b29ceb03d @homme homme committed with tbonfort Feb 20, 2013
Showing with 10 additions and 0 deletions.
  1. +10 −0 mapcopy.c
View
@@ -346,6 +346,16 @@ int msCopyLabel(labelObj *dst, labelObj *src)
MS_COPYSTELEM(outlinewidth);
MS_COPYSTELEM(space_size_10);
+ if (msCopyExpression(&(dst->expression), &(src->expression)) != MS_SUCCESS) {
+ msSetError(MS_MEMERR, "Failed to copy expression.", "msCopyLabel()");
+ return MS_FAILURE;
+ }
+
+ if (msCopyExpression(&(dst->text), &(src->text)) != MS_SUCCESS) {
+ msSetError(MS_MEMERR, "Failed to copy text.", "msCopyLabel()");
+ return MS_FAILURE;
+ }
+
/*
** now the styles
*/

0 comments on commit 547391d

Please sign in to comment.